Fix NPE on getting environment variables
Fix nested structure formatting
Merge pull request #432 from dlsniper/fix-431

Fix NPE on getting environment variables (fixes #431)
Merge pull request #434 from dlsniper/fix-255

Fix nested structure formatting (fixes #255)