Fix a few NPE's caused by classes failing to load
Fixes #67