ISSUE 33: Fixed NPE when used with some mods