Fixed problem when environment variable is not defined for SCI-1889 and
DAWNSCI-927