Fix try catch blocks. Update to 1.6.1