Fix for exception at startup