Fix NPE in IntentHandler.