Handle no dict properly.
Merge pull request #73 from larsxschneider/fix-no-dict

Handle no dict properly.