DATACOUCH-17 - Make ops sync & map exceptions