Merge "BUG 274 REST response instead of NumberFormatException"