Catch invalid saltenv
Merge pull request #16102 from cachedout/issue_16073

Catch invalid saltenv