Merge "null check jarfile before using" into nyc-mr1-dev