more error handling

Catch all seems sensible