More changes suggested by @dlongley.

Author: gkellogg

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 ### Fixed
 - More support for `"@type": "@none"`.
+- JSON literal value handling issues (`null` and `[]`).
 
 ### Added
 - Support for extracting JSON-LD from HTML, when the xmldom package is loaded.

lib/documentLoaders/xhr.js

@@ -87,8 +87,8 @@ module.exports = ({
 
     // handle Link Header (avoid unsafe header warning by existence testing)
     let linkHeader;
-    if(REGEX_LINK_HEADER.test(req.getAllResponseHeaders()) &&
-      contentType !== 'application/ld+json') {
+    if(contentType !== 'application/ld+json' &&
+      REGEX_LINK_HEADER.test(req.getAllResponseHeaders())) {
       linkHeader = req.getResponseHeader('Link');
     }
     if(linkHeader && contentType !== 'application/ld+json') {

lib/jsonld.js

@@ -935,16 +935,17 @@ jsonld.get = async function(url, options) {
     }
   } catch(e) {
     if(e.name === 'jsonld.InvalidScriptElement') {
+      // pass error detected in HTML decode
       throw (e);
-    } else {
-      throw new JsonLdError(
-        'Could not retrieve a JSON-LD document from the URL.',
-        'jsonld.LoadDocumentError', {
-          code: 'loading document failed',
-          cause: e,
-          remoteDoc
-        });
     }
+    // otherwise, general loading error
+    throw new JsonLdError(
+      'Could not retrieve a JSON-LD document from the URL.',
+      'jsonld.LoadDocumentError', {
+        code: 'loading document failed',
+        cause: e,
+        remoteDoc
+      });
   }
 
   return remoteDoc;