diff --git a/dbms/src/Functions/FunctionsRound.h b/dbms/src/Functions/FunctionsRound.h
index 1a85db5ecb2..977fe667681 100644
--- a/dbms/src/Functions/FunctionsRound.h
+++ b/dbms/src/Functions/FunctionsRound.h
@@ -394,8 +394,8 @@ public:
             case 1000000000000000000ULL: return applyImpl<1000000000000000000ULL>(in, out);
             case 10000000000000000000ULL: return applyImpl<10000000000000000000ULL>(in, out);
             default:
-                throw Exception("Logical error: unexpected 'scale' parameter passed to function IntegerRoundingComputation::compute",
-                    ErrorCodes::LOGICAL_ERROR);
+                throw Exception("Unexpected 'scale' parameter passed to function",
+                    ErrorCodes::BAD_ARGUMENTS);
         }
     }
 };
diff --git a/dbms/tests/queries/0_stateless/00161_rounding_functions.sql b/dbms/tests/queries/0_stateless/00161_rounding_functions.sql
index 66fcc75ff35..460129d2e9d 100644
--- a/dbms/tests/queries/0_stateless/00161_rounding_functions.sql
+++ b/dbms/tests/queries/0_stateless/00161_rounding_functions.sql
@@ -43,3 +43,5 @@ SELECT 12345.6789 AS x, floor(x, -1), floor(x, -2), floor(x, -3), floor(x, -4),
 
 SELECT roundToExp2(100), roundToExp2(64), roundToExp2(3), roundToExp2(0), roundToExp2(-1);
 SELECT roundToExp2(0.9), roundToExp2(0), roundToExp2(-0.5), roundToExp2(-0.6), roundToExp2(-0.2);
+
+SELECT ceil(29375422, -54212) --{serverError 36}