Merge pull request #117 from TheBlueMatt/2022-08-fix-npe