Just seen a test with a null m_xHandler, no idea how that happened. Change-Id: I2e5ff9d3c799284beea5fdca37fa8a825f8a4756