NPE from InspectorTool (guard null for changes introduced in a24bbf25)