Add some extra safety checks