Bugfix: if environment variables are empty null is returned