Aggresive exception catching fixes #1