Right, this probably needs a more robust implementation ... I will put it into the mapper interface and try to make it behave graceful in this situations.