Reinstated a few nothrows