[DF-4070] Fixed error handling
Merge branch 'maps_versioning' of https://github.com/dava/dava.framework into maps_versioning