2 files changed, 5 insertions, 4 deletions
diff --git a/src/env.c b/src/env.c
index 0fe5eb9d..d77e77fc 100644
--- a/src/env.c
+++ b/src/env.c
@@ -20,6 +20,7 @@
 
 #include "serd/serd.h"
 
+#include <assert.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -275,8 +276,9 @@ serd_env_expand(const SerdEnv* env, const SerdNode* node)
 		return serd_new_resolved_uri_i(
 			serd_node_get_string(node), &env->base_uri);
 	default:
-		return NULL;
+		break;
 	}
+	return NULL;
 }
 
 void
diff --git a/src/n3.c b/src/n3.c
index 468d5d4a..476bce7b 100644
--- a/src/n3.c
+++ b/src/n3.c
@@ -1351,11 +1351,10 @@ read_directive(SerdReader* reader)
 	switch (peek_byte(reader)) {
 	case 'B': case 'b': return read_base(reader, sparql, true);
 	case 'P': case 'p': return read_prefixID(reader, sparql, true);
-	default:
-		return r_err(reader, SERD_ERR_BAD_SYNTAX, "invalid directive\n");
+	default: break;
 	}
 
-	return SERD_SUCCESS;
+	return r_err(reader, SERD_ERR_BAD_SYNTAX, "invalid directive\n");
 }
 
 static SerdStatus