don't crash if no env vars or cfg is present
Merge branch 'experimental'