From e5a0dc8eb6b374fe87863dc567493a5867600493 Mon Sep 17 00:00:00 2001
From: bill bittner <bittner.w@gmail.com>
Date: Wed, 23 Aug 2017 14:40:35 -0700
Subject: [PATCH] tested conflicting channel ids and updated logging

---
 helpers/serveHelpers.js    | 16 +++++++++-------
 views/noChannel.handlebars |  4 ++--
 views/noClaims.handlebars  |  2 +-
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/helpers/serveHelpers.js b/helpers/serveHelpers.js
index 1829d11f..934583b2 100644
--- a/helpers/serveHelpers.js
+++ b/helpers/serveHelpers.js
@@ -172,7 +172,7 @@ function getShortChannelId (channelName, longChannelId) {
             });
           }
           // return the short Id
-          logger.debug('short claim id ===', shortId);
+          logger.debug('short channel id ===', shortId);
           return resolve(shortId);
       }
     })
@@ -334,12 +334,14 @@ module.exports = {
         return getAllChannelClaims(longChannelId);
       })
       .then(allChannelClaims => {
-        allChannelClaims.forEach(element => {
-          element['channelName'] = channelName;
-          element['longChannelId'] = longChannelId;
-          element['shortChannelId'] = shortChannelId;
-          element['fileExtension'] = element.contentType.substring(element.contentType.lastIndexOf('/') + 1);
-        });
+        if (allChannelClaims) {
+          allChannelClaims.forEach(element => {
+            element['channelName'] = channelName;
+            element['longChannelId'] = longChannelId;
+            element['shortChannelId'] = shortChannelId;
+            element['fileExtension'] = element.contentType.substring(element.contentType.lastIndexOf('/') + 1);
+          });
+        }
         return resolve(allChannelClaims);
       })
       .catch(error => {
diff --git a/views/noChannel.handlebars b/views/noChannel.handlebars
index 66405b50..585c0298 100644
--- a/views/noChannel.handlebars
+++ b/views/noChannel.handlebars
@@ -2,7 +2,7 @@
 	{{> topBar}}
 	<div>
 		<h3>No Claims</h3>
-		<p>There are no free, public assets on this channel.</p>
-		<p><i>If you think this message is an error, contact us in Slack!</i></p>
+		<p>There are no free assets on this channel.</p>
+		<p><i>If you think this message is an error, contact us in the <a href="https://lbry.slack.com/" target="_blank">LBRY slack!</a></i></p>
 	</div>
 </div>
\ No newline at end of file
diff --git a/views/noClaims.handlebars b/views/noClaims.handlebars
index dbe6c592..9e918fa8 100644
--- a/views/noClaims.handlebars
+++ b/views/noClaims.handlebars
@@ -2,7 +2,7 @@
 	{{> topBar}}
 	<div>
 		<h3>No Claims</h3>
-		<p>There are no free, public images at that claim.  You should publish one at <a href="/">spee.ch</a>.</p>
+		<p>There are no free assets at that claim.  You should publish one at <a href="/">spee.ch</a>.</p>
 		<p>NOTE: it is possible your claim was published, but it is still being processed by the blockchain</p>
 	</div>
 </div>
\ No newline at end of file