Fixed error messages for retrieving environment variables

Change-Id: Ib84479bfc702de1e1c6a0d09ed7ccf6ad06e1b2b
1 file changed