Less aggressive exception catching

Catch the exceptions that really make sense to catch here.