Fixed a case where a npe would generate from clicking on non-world items