Changing from the || test to a ternary statement due to an error raised by EG & the EST pipeline when migrating from v1.136 to v1.37 of this file. If this does not solve it then it must be the throw above which has caused it.