Slightly more robust, and register nulls when we can't load.
Logging
Rename.
Simplify.
Fix NPE
Update documentation, explain design decisions a bit.