Added extra safety catch