Add null check for common schema manager

Add null check for common schema manager #632