Added non existent environment verification

Change-Id: I346a5b049360f4c499d065812d0bd79e2e614289
Merge "Added non existent environment verification"