diff --git a/controllers/serveController.js b/controllers/serveController.js
index 16d5ac67..bbc96dab 100644
--- a/controllers/serveController.js
+++ b/controllers/serveController.js
@@ -12,6 +12,7 @@ const NO_CHANNEL = 'NO_CHANNEL';
 const NO_CLAIM = 'NO_CLAIM';
 
 function checkForLocalAssetByClaimId (claimId, name) {
+  logger.debug(`checkForLocalAssetsByClaimId(${claimId}, ${name}`);
   return new Promise((resolve, reject) => {
     db.File
       .findOne({where: { name, claimId }})
@@ -69,7 +70,8 @@ function getAssetByLongClaimId (fullClaimId, name) {
           logger.debug('resolve result >> ', resolveResult);
           // if no result, return early (claim doesn't exist or isn't free)
           if (!resolveResult) {
-            return resolve(null);
+            resolve(NO_CLAIM);
+            return;
           }
           let fileRecord = {};
           // get the claim
diff --git a/views/noChannel.handlebars b/views/noChannel.handlebars
index 19476180..6f43d584 100644
--- a/views/noChannel.handlebars
+++ b/views/noChannel.handlebars
@@ -1,4 +1,4 @@
-<div class="row">
+<div class="row row--padded">
     <h3>No Channel</h3>
     <p>There are no published channels matching your url</p>
     <p>If you think this message is an error, contact us in the <a class="link--primary" href="https://discord.gg/YjYbwhS" target="_blank">LBRY Discord!</a></p>
diff --git a/views/noClaim.handlebars b/views/noClaim.handlebars
index 6cc37965..86273814 100644
--- a/views/noClaim.handlebars
+++ b/views/noClaim.handlebars
@@ -1,4 +1,4 @@
-<div class="row">
+<div class="row row--padded">
     <h3>No Claims</h3>
     <p>There are no free assets at that claim.  You should publish one at <a class="link--primary" href="/">spee.ch</a>.</p>
     <p>NOTE: it is possible your claim was published, but it is still being processed by the blockchain</p>