Added missing status checks