MAP-211: throw exception isntead of simply logging