MORE lock safety checks!