Fixed a couple more NPEs for edge cases and also reinstated the ability
to load annotations for a single node