fixed null fields, fixed notNull 

notNull is a bit of a hack for fixing unloadable dll references inside a call.