More safety checks for house fields