-fix

1 files changed, 7 insertions, 4 deletions

diff --git a/src/fs/fs_uri.c b/src/fs/fs_uri.c
index 9d8691b76..a3a54227f 100644
--- a/src/fs/fs_uri.c
+++ b/src/fs/fs_uri.c
@@ -940,16 +940,19 @@ GNUNET_FS_uri_sks_create (struct GNUNET_FS_Namespace *ns, const char *id,
   struct GNUNET_FS_Uri *ns_uri;
 
   if (NULL == id)
-  {
-    *emsg = GNUNET_strdup (_("identifier is NULL!"));
+  { 
+    if (NULL != emsg)
+      *emsg = GNUNET_strdup (_("identifier is NULL!"));
     return NULL;
   }
   else if ('\0' == id[0])
   {
-    *emsg = GNUNET_strdup (_("identifier has zero length!"));
+    if (NULL != emsg)
+      *emsg = GNUNET_strdup (_("identifier has zero length!"));
     return NULL;
   }
-  *emsg = NULL;
+  if (NULL != emsg)
+    *emsg = NULL;
   ns_uri = GNUNET_malloc (sizeof (struct GNUNET_FS_Uri));
   ns_uri->type = GNUNET_FS_URI_SKS;
   GNUNET_FS_namespace_get_public_identifier (ns, &ns_uri->data.sks.ns);