fix for #3090 and #3091
fix for #3090 and #3091
locks moved to outside of try block for fixing issues #3090 and #3091
fix for #3090 and #3091
Merge pull request #3136 from serkan-ozal/fix/3.3-RC3/issue-3090-and-3091

fix for #3090 and #3091