Get rid of catch-all exceptions. LP#1178485.