Fix NPE on startup fixes problem that arose after fixing issue #77 #79

Closed just-push-it closed 11 years ago