Fixes an NPE and InvalidOperationException.#766
Open
valkyrieBae wants to merge 2 commits intovalheimPlus:developmentfrom 
Open
Fixes an NPE and InvalidOperationException.#766valkyrieBae wants to merge 2 commits intovalheimPlus:developmentfrom 
valkyrieBae wants to merge 2 commits intovalheimPlus:developmentfrom