BDSHR-389 : Changed eror messaging based on dev box feedback