[PLAT-6708] Adding more checks to make it more resilient
Merge pull request #159 from OpenGamma/topic/plat-6708/round2

[PLAT-6708] Adding more checks to make it more resilient