CON-1303: Fix error messaging