fixes #106. shift the null check to the EDT to asure existence of feature
Merge branch 'feature/106-prevent-NPE-in-mapping-component' into dev