Fix for TUSCANY-1780. Put in a catch for special condition described in the problem. Handling this case outside of the EMF provided methods -- dropping through for other cases.