Moved null checking into introspect methods