Reverting "Merge "fix try block""