Prevent currentTarget from ever being null