Merge "Stop silently dropping a NullPointerException"