Fix #115 Additional exception catching + general catch

This isn't correct, but legacy demands it.