Smallfix: Catch some exceptions