Fix for issue #310 (nullpointer exception on windows startup)