Don't crash on listener registrations.
am: 30acc22dac

Change-Id: Iafa2a65e227af34bd515fc9e62e028d72da0edaa