another npe check attempt

doing commits so that i can get compiled versions to check against a
many-mod install, because i don't crash in mcp.