Re #10817 Minor bug in DirectEnergyConversion

(header not defined if scrip fails)
Merge branch 'bugfix/10817_errorHardmaskPlus' into develop