More checks for added resume safety