Make things protected so they can be overridden
Better handling of nulls for unknown classes