diff --git a/src/main/java/org/archive/extract/WATExtractorOutput.java b/src/main/java/org/archive/extract/WATExtractorOutput.java
index 00e0875c..2e25abf1 100644
--- a/src/main/java/org/archive/extract/WATExtractorOutput.java
+++ b/src/main/java/org/archive/extract/WATExtractorOutput.java
@@ -167,7 +167,7 @@ private void writeWARC(OutputStream recOut, MetaData md) throws IOException {
 		String warcType = extractOrIO(md, "Envelope.WARC-Header-Metadata.WARC-Type");
 		String targetURI;
 		if(warcType.equals("warcinfo")) {
-			targetURI = extractOrIO(md, "Envelope.WARC-Header-Metadata.WARC-Filename");
+			targetURI = JSONUtils.extractSingle(md, "Envelope.WARC-Header-Metadata.WARC-Filename");
 		} else {
 			targetURI = extractOrIO(md, "Envelope.WARC-Header-Metadata.WARC-Target-URI");
 		}
diff --git a/src/main/java/org/archive/format/warc/WARCRecordWriter.java b/src/main/java/org/archive/format/warc/WARCRecordWriter.java
index 4f5e7461..02e6700e 100644
--- a/src/main/java/org/archive/format/warc/WARCRecordWriter.java
+++ b/src/main/java/org/archive/format/warc/WARCRecordWriter.java
@@ -100,7 +100,10 @@ public void writeJSONMetadataRecord( OutputStream out,
   {
     HttpHeaders headers = new HttpHeaders();
     headers.add(HEADER_KEY_TYPE, WARCRecordType.metadata.name());
-    headers.add(HEADER_KEY_URI, targetURI);
+    if (targetURI != null) {
+        // WARC-Target-URI is optional in metadata records
+        headers.add(HEADER_KEY_URI, targetURI);
+    }
     headers.add(HEADER_KEY_DATE, DateUtils.getLog14Date(originalDate));
     headers.add(HEADER_KEY_ID, makeRecordId());
     headers.add(HEADER_KEY_REFERS_TO, origRecordId);