Fix ClassCastException when no settings are present
Merge pull request #634 from merk/more-mapping-tests

Fix ClassCastException when no settings are present