diff --git a/src/util/taler-exchange-secmod-eddsa.c b/src/util/taler-exchange-secmod-eddsa.c
index 665622552..d06c1e71f 100644
--- a/src/util/taler-exchange-secmod-eddsa.c
+++ b/src/util/taler-exchange-secmod-eddsa.c
@@ -389,6 +389,8 @@ sign_worker (void *cls)
     if (! in_shutdown)
       break;
     /* queue is empty, wait for work */
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "Crypto worker waiting for work...\n");
     GNUNET_assert (0 ==
                    pthread_cond_wait (&work_cond,
                                       &work_lock));
@@ -1629,6 +1631,8 @@ run (void *cls,
   /* start crypto workers */
   if (0 == num_workers)
     num_workers = sysconf (_SC_NPROCESSORS_CONF);
+  if (0 == num_workers)
+    num_workers = 1;
   workers = GNUNET_new_array (num_workers,
                               pthread_t);
   for (unsigned int i = 0; i<num_workers; i++)
diff --git a/src/util/taler-exchange-secmod-rsa.c b/src/util/taler-exchange-secmod-rsa.c
index 742175c09..dd37dd7a8 100644
--- a/src/util/taler-exchange-secmod-rsa.c
+++ b/src/util/taler-exchange-secmod-rsa.c
@@ -449,6 +449,8 @@ sign_worker (void *cls)
     if (! in_shutdown)
       break;
     /* queue is empty, wait for work */
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "Crypto worker waiting for work...\n");
     GNUNET_assert (0 ==
                    pthread_cond_wait (&work_cond,
                                       &work_lock));
@@ -2020,6 +2022,8 @@ run (void *cls,
   /* start crypto workers */
   if (0 == num_workers)
     num_workers = sysconf (_SC_NPROCESSORS_CONF);
+  if (0 == num_workers)
+    num_workers = 1;
   workers = GNUNET_new_array (num_workers,
                               pthread_t);
   for (unsigned int i = 0; i<num_workers; i++)