Safer error catching
0.4.1