More safety checks