Fixed issue where NullType was referenced.