guard against empty strings in env variables
Merge pull request #5 from martintrojer/master

guard against empty strings in env variables