Style fixes
Catch only the excpected exceptions
Changelog