Remove 'catch' round server

It's not backward compatible, and the error message is probably better
than silently failing anyway.