diff --git a/src/setup/cmd_line_function_macros.h b/src/setup/cmd_line_function_macros.h
index c682efbfe187f36ad045d649e84954fe7d705545..33d0c17c96f4745052fe8c99be47c19e82325401 100644
--- a/src/setup/cmd_line_function_macros.h
+++ b/src/setup/cmd_line_function_macros.h
@@ -24,7 +24,7 @@
             if(errno)                                                   \
             {                                                           \
                 char errstring[100];                                    \
-                if(strerror_r(errnum,errstring,100))                    \
+                if(strerror_r(errnum,errstring,100)==0)                 \
                 {                                                       \
                     Exit_binary_c(                                      \
                         BINARY_C_UNDER_OR_OVERFLOW,                     \
@@ -48,9 +48,9 @@
                         errnum                                          \
                         );                                              \
                 }                                                       \
-                *((double*) a->pointer) = a->modulate * test;           \
-                __match=TRUE;                                           \
             }                                                           \
+            *((double*) a->pointer) = a->modulate * test;               \
+            __match=TRUE;                                               \
         }                                                               \
         else                                                            \
         {                                                               \
@@ -73,7 +73,7 @@
         if(__match == FALSE)                                            \
         {                                                               \
             Exit_binary_c(BINARY_C_WRONG_ARGUMENT,                      \
-                          "Argument \"%s\" following %s is neither integer not matched an appropriate macro. Please check it!\n", \
+                          "Argument \"%s\" following %s is neither a double precision not matched an appropriate macro. Please check it!\n", \
                           argv[c],                                      \
                           argv[c-1]);                                   \
         }                                                               \
@@ -203,7 +203,7 @@
         if(errno)                                                       \
         {                                                               \
             char errstring[100];                                        \
-            if(strerror_r(errnum,errstring,100))                        \
+            if(strerror_r(errnum,errstring,100)==0)                     \
             {                                                           \
                 Exit_binary_c(                                          \
                     BINARY_C_UNDER_OR_OVERFLOW,                         \