Avoid NullPointerException in getHandler()

Change-Id: I32ddfbece78b07ce54de1560be26b5962deff9e9