diff --git a/src/main/java/net/thauvin/erik/mobibot/Utils.kt b/src/main/java/net/thauvin/erik/mobibot/Utils.kt
index a549ac3..d5c3486 100644
--- a/src/main/java/net/thauvin/erik/mobibot/Utils.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/Utils.kt
@@ -86,9 +86,7 @@ object Utils {
      * Capitalize a string.
      */
     @JvmStatic
-    fun capitalize(s: String?): String {
-        return s!!.replaceFirstChar { it.uppercase() }
-    }
+    fun capitalize(s: String?): String? = s?.replaceFirstChar { it.uppercase() }
     
     /**
      * Colorize a string.
diff --git a/src/main/java/net/thauvin/erik/mobibot/entries/EntryLink.kt b/src/main/java/net/thauvin/erik/mobibot/entries/EntryLink.kt
index cbc6879..08d10e7 100644
--- a/src/main/java/net/thauvin/erik/mobibot/entries/EntryLink.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/entries/EntryLink.kt
@@ -152,8 +152,8 @@ class EntryLink : Serializable {
      * Sets a comment.
      */
     fun setComment(index: Int, comment: String?, nick: String?) {
-        if (index < comments.size) {
-            comments[index] = EntryComment(comment!!, nick!!)
+        if (index < comments.size && (comment != null) && !nick.isNullOrBlank()) {
+            comments[index] = EntryComment(comment, nick)
         }
     }
 
diff --git a/src/test/java/net/thauvin/erik/mobibot/UtilsTest.kt b/src/test/java/net/thauvin/erik/mobibot/UtilsTest.kt
index f62663d..145ae7a 100644
--- a/src/test/java/net/thauvin/erik/mobibot/UtilsTest.kt
+++ b/src/test/java/net/thauvin/erik/mobibot/UtilsTest.kt
@@ -82,6 +82,8 @@ class UtilsTest {
     fun testCapitalize() {
         Assertions.assertThat(capitalize("test")).`as`("capitalize(test)").isEqualTo("Test")
         Assertions.assertThat(capitalize("Test")).`as`("capitalize(Test)").isEqualTo("Test")
+        Assertions.assertThat(capitalize(null)).`as`("captitalize(null)").isNull()
+        Assertions.assertThat(capitalize("")).`as`("capitalize()").isEqualTo("")
     }
 
     @Test
diff --git a/version.properties b/version.properties
index 1e1926e..8e5338f 100644
--- a/version.properties
+++ b/version.properties
@@ -1,9 +1,9 @@
 #Generated by the Semver Plugin for Gradle
-#Mon Apr 26 22:11:16 PDT 2021
-version.buildmeta=475
+#Tue Apr 27 17:59:17 PDT 2021
+version.buildmeta=487
 version.major=0
 version.minor=8
 version.patch=0
 version.prerelease=beta
 version.project=mobibot
-version.semver=0.8.0-beta+475
+version.semver=0.8.0-beta+487