Merge "Fix NullPointerException on push over HTTP"