2 files changed, 4 insertions, 2 deletions
diff --git a/src/config.c b/src/config.c
index c3b2e22..0c681ac 100644
--- a/src/config.c
+++ b/src/config.c
@@ -165,7 +165,7 @@ ARGMATCH_VERIFY (event_args, event_types);
 const char *
 notification_event_str (enum notification_event evt)
 {
-  return event_args[evt];
+  return ARGMATCH_TO_ARGUMENT ((char*)&evt, event_args, event_types);
 }
 
 int
@@ -203,7 +203,7 @@ ARGMATCH_VERIFY (target_args, target_types);
 const char *
 notification_target_str (enum notification_target tgt)
 {
-  return target_args[tgt];
+  return ARGMATCH_TO_ARGUMENT ((char*)&tgt, target_args, target_types);
 }
 
 int
diff --git a/src/mail.c b/src/mail.c
index 98f6c4a..756490a 100644
--- a/src/mail.c
+++ b/src/mail.c
@@ -480,6 +480,8 @@ get_uploader_email (struct uploader_info *info, struct file_triplet *trp,
   mu_address_t rcpt = NULL;
   int rc;
   
+  if (!info)
+    return NULL;
   rc = mu_address_create (&addr, info->email);
   if (rc)
     {