1 files changed, 4 insertions, 1 deletions
diff --git a/src/n3.c b/src/n3.c
index 7042233f..a6d8d801 100644
--- a/src/n3.c
+++ b/src/n3.c
@@ -1211,7 +1211,7 @@ read_object(SerdReader* const  reader,
     o->flags = flags;
   }
 
-  if (!st && emit && simple) {
+  if (!st && emit && simple && o) {
     st = emit_statement(reader, *ctx, o);
   } else if (!st && !emit) {
     ctx->object = o;
@@ -1451,6 +1451,7 @@ read_base(SerdReader* const reader, const bool sparql, const bool token)
 
   SerdNode* uri = NULL;
   TRY(st, read_IRIREF(reader, &uri));
+  serd_node_zero_pad(uri);
   TRY(st, serd_sink_write_base(reader->sink, uri));
 
   read_ws_star(reader);
@@ -1489,6 +1490,8 @@ read_prefixID(SerdReader* const reader, const bool sparql, const bool token)
   SerdNode* uri = NULL;
   TRY(st, read_IRIREF(reader, &uri));
 
+  serd_node_zero_pad(name);
+  serd_node_zero_pad(uri);
   st = serd_sink_write_prefix(reader->sink, name, uri);
 
   if (!sparql) {