Fixed introduced null pointer in previous merge.
merge branch 'master' into noPairWise