Crash-Bugfix

Prevents a NPE in some cases. I can't really tell the exact cause as it crashed our server on startup. Seems apropriate however as the field is checked for null everywhere else.