GIBS-433 Simplified error messages