Move lock before try

Signed-off-by: Jorge Bescos Gascon <jorge.bescos.gascon@oracle.com>
76 files changed