Merge "Properly catch exceptions"