Fix for #NMS-6125. Also added Smoketests and fixed other Exception-Mappings.