Fix access to non-existing map entry, code maintainence Closes #83 See merge request zdvresearch_bsc/adafs!111