Added additional sanity check in schema management.