diff --git a/tex/generic/pgf/math/pgfmathfunctions.basic.code.tex b/tex/generic/pgf/math/pgfmathfunctions.basic.code.tex
index 2dbf154d8..c6e3586ff 100644
--- a/tex/generic/pgf/math/pgfmathfunctions.basic.code.tex
+++ b/tex/generic/pgf/math/pgfmathfunctions.basic.code.tex
@@ -69,8 +69,8 @@
         \pgfmath@y=#2pt\relax%
         \let\pgfmath@sign=\pgfmath@empty%
         \ifdim0pt=\pgfmath@y%
-            \pgfmath@error{You've asked me to divide `#1' by `#2', %
-                but I cannot divide any number by `#2'}%
+            \pgfmath@error{You've~asked~me~to~divide~`#1'~by~`#2',~%
+                but~I~cannot~divide~any~number~by~`#2'}%
         \fi%
         \afterassignment\pgfmath@xa%
         \c@pgfmath@counta\the\pgfmath@y\relax%
@@ -205,7 +205,7 @@
     \begingroup%
         \expandafter\pgfmath@x#1pt\relax%
         \ifdim\pgfmath@x=0pt\relax%
-            \pgfmath@error{You asked me to calculate `1/#1', but I cannot divide any number by zero}{}%
+            \pgfmath@error{You~asked~me~to~calculate~`1/#1',~but~I~cannot~divide~any~number~by~zero}{}%
         \fi%
         \edef\pgfmath@reciprocaltemp{\pgfmath@tonumber{\pgfmath@x}}%
         \expandafter\pgfmathreciprocal@@\pgfmath@reciprocaltemp0000000\pgfmath@}
@@ -337,7 +337,7 @@
     \begingroup%
         \expandafter\pgfmath@x#1pt\relax%
         \ifdim\pgfmath@x>0pt\else%
-            \pgfmath@error{I cannot calculate the logarithm of `#1'}{}%
+            \pgfmath@error{I~cannot~calculate~the~logarithm~of~`#1'}{}%
         \fi%
         \c@pgfmath@counta=0\relax%
         \ifdim\pgfmath@x>2pt\relax%
@@ -563,7 +563,7 @@
     \begingroup%
         \expandafter\pgfmath@x#1pt\relax%
         \ifdim\pgfmath@x<0pt\relax%
-            \pgfmath@error{I cannot calculate the square-root of the negative number `#1'}{}%
+            \pgfmath@error{I~cannot~calculate~the~square-root~of~the~negative~number~`#1'}{}%
         \else%
             \ifdim\pgfmath@x<10pt\relax%
                 \def\pgfmath@zeros{0}%