Add better exception catching

[zero-point]

Catch more specific exceptions, which would better identify errors