GPII-245: fixed up handler null handling.