Address reload bug.

Fix NullPointerExceptions on reload.