am c3797f40: am 4754f401: Merge "Avoid NullPointerException in getHandler()"

* commit 'c3797f40c1a8a8f7ca72816642110221933ff8fd':
  Avoid NullPointerException in getHandler()