Merge "Avoid NullPointerException in getHandler()"