diff --git a/.gitignore b/.gitignore
index b363a7e0..5070f40b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,7 +30,7 @@ vendor/**/tests
 vendor/**/build_phar.php
 !vendor/**/*.php
 
-# Ignore local node modules, unit testing logs, api docs and eclipse project files
+# Ignore local node modules, unit testing logs, api docs and IDE project files
 js/node_modules/
 js/test.log
 tst/log/
@@ -39,3 +39,4 @@ tst/ConfigurationCombinationsTest.php
 .buildpath
 .project
 .externalToolBuilders
+.c9
diff --git a/js/privatebin.js b/js/privatebin.js
index 1566ea3e..d48e0fbc 100644
--- a/js/privatebin.js
+++ b/js/privatebin.js
@@ -4099,7 +4099,7 @@ jQuery.PrivateBin = (function($, sjcl, Base64, RawDeflate) {
                 DiscussionViewer.addComment(
                     comment,
                     CryptTool.decipher(key, password, comment.data),
-                    CryptTool.decipher(key, password, comment.meta.nickname)
+                    comment.meta.nickname ? CryptTool.decipher(key, password, comment.meta.nickname) : ''
                 );
             }
 
diff --git a/tpl/bootstrap.php b/tpl/bootstrap.php
index 5741c645..9716ed28 100644
--- a/tpl/bootstrap.php
+++ b/tpl/bootstrap.php
@@ -75,7 +75,7 @@ if ($MARKDOWN):
 <?php
 endif;
 ?>
-		<script type="text/javascript" data-cfasync="false" src="js/privatebin.js?<?php echo rawurlencode($VERSION); ?>" integrity="sha512-19QipeKjOhdFEn7KpfTd9p1YJqXIxSDm+KrTTIQKRhKErCq82AtFkOUVf2+qXDi/xJoYXW5QVIksKK6w2hgFXQ==" crossorigin="anonymous"></script>
+		<script type="text/javascript" data-cfasync="false" src="js/privatebin.js?<?php echo rawurlencode($VERSION); ?>" integrity="sha512-58qLFLcas6iQt7PWb4HcjAQlhKEi+XyZfYALB9VFkoeXR2vhpbQh1DuHc9jardc/HcDkr1hMkQfTlCjyWuTB8g==" crossorigin="anonymous"></script>
 		<!--[if lt IE 10]>
 		<style type="text/css">body {padding-left:60px;padding-right:60px;} #ienotice {display:block;} #oldienotice {display:block;}</style>
 		<![endif]-->
diff --git a/tpl/page.php b/tpl/page.php
index 613e5a09..b42ceef3 100644
--- a/tpl/page.php
+++ b/tpl/page.php
@@ -54,7 +54,7 @@ if ($QRCODE):
 <?php
 endif;
 ?>
-		<script type="text/javascript" data-cfasync="false" src="js/privatebin.js?<?php echo rawurlencode($VERSION); ?>" integrity="sha512-19QipeKjOhdFEn7KpfTd9p1YJqXIxSDm+KrTTIQKRhKErCq82AtFkOUVf2+qXDi/xJoYXW5QVIksKK6w2hgFXQ==" crossorigin="anonymous"></script>
+		<script type="text/javascript" data-cfasync="false" src="js/privatebin.js?<?php echo rawurlencode($VERSION); ?>" integrity="sha512-58qLFLcas6iQt7PWb4HcjAQlhKEi+XyZfYALB9VFkoeXR2vhpbQh1DuHc9jardc/HcDkr1hMkQfTlCjyWuTB8g==" crossorigin="anonymous"></script>
 		<!--[if lt IE 10]>
 		<style type="text/css">body {padding-left:60px;padding-right:60px;} #ienotice {display:block;} #oldienotice {display:block;}</style>
 		<![endif]-->