Patches for fewer exceptions