Stop swallowing exceptions!
Fixes for not swallowing exceptions.