tidy up catch blocks after #580