added sanity check to trap statement
Merge branch 'master' of https://github.com/Aricg/portable_env