[Mappings] Refactoring - added missing throwing of a RuntimeException