Merge "Fix null pointer exception" into tm-qpr-dev