Eng 6428 - Review only.wait for merge till System tests have run.

I had caught this as it returns null makes NPE here next commit has fix around it.