CDB-1082 #resolves Improves WMS error message
Merge CDB-1082 into release/2.8.3