diff --git a/app/src/main/java/com/github/libretube/extensions/FormatShort.kt b/app/src/main/java/com/github/libretube/extensions/FormatShort.kt
index f0751db56..bb010765b 100644
--- a/app/src/main/java/com/github/libretube/extensions/FormatShort.kt
+++ b/app/src/main/java/com/github/libretube/extensions/FormatShort.kt
@@ -3,15 +3,17 @@ package com.github.libretube.extensions
 import java.math.BigDecimal
 import java.math.RoundingMode
 
+@Suppress("KotlinConstantConditions")
 fun Long?.formatShort(): String = when {
-    this!! < 1000 -> {
+    this == null -> (0).toString()
+    this < 1000 -> {
         this.toString()
     }
-    this in 1000..999999 -> {
+    this in (1000..999999) -> {
         val decimal = BigDecimal(this / 1000).setScale(0, RoundingMode.HALF_EVEN)
         decimal.toString() + "K"
     }
-    this in 1000000..10000000 -> {
+    this in (1000000..10000000) -> {
         val decimal = BigDecimal(this / 1000000).setScale(0, RoundingMode.HALF_EVEN)
         decimal.toString() + "M"
     }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 3d6683c56..9561d0ba2 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -134,7 +134,7 @@
     <string name="contributing">Contributing</string>
     <string name="donate">Donate</string>
     <string name="update">Look for new version</string>
-    <string name="update_summary">Click to find out if the app is up to date.</string>
+    <string name="update_summary">Check for update</string>
     <string name="app_uptodate">Running the latest version.</string>
     <string name="no_update_available">You are running the latest version.</string>
     <string name="playback_speed">Playback speed</string>