Some extra safety checks