- SPIGOT-4605: Catch more physics problems