@manics, in my latest branch I've refactored this. Depending on which branch goes in first, we can get them all co-ordinated.

See: `IceMapper.handleServerError` in faf96a82eeb8881a774825d43a6de43908f95765