fix type and name null problem