Fixed NullReferenceException if no Identfier given