diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt
index b8321b408..b0dce641f 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt
@@ -14,8 +14,6 @@ import java.io.File
 
 fun <T> Preference<T>.getOrDefault(): T = get() ?: defaultValue()!!
 
-fun <T> Preference<T>.nullGetOrDefault(): T? = get() ?: defaultValue()
-
 fun Preference<Boolean>.invert(): Boolean = getOrDefault().let { set(!it); !it }
 
 class PreferencesHelper(val context: Context) {
diff --git a/app/src/main/java/eu/kanade/tachiyomi/source/online/all/EHentai.kt b/app/src/main/java/eu/kanade/tachiyomi/source/online/all/EHentai.kt
index 2750e1f0c..9edf3d88e 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/source/online/all/EHentai.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/source/online/all/EHentai.kt
@@ -257,9 +257,9 @@ class EHentai(override val id: Long,
     val cookiesHeader by lazy {
         val cookies: MutableMap<String, String> = mutableMapOf()
         if(prefs.enableExhentai().getOrDefault()) {
-            cookies.put(LoginActivity.MEMBER_ID_COOKIE, prefs.memberIdVal().getOrDefault())
-            cookies.put(LoginActivity.PASS_HASH_COOKIE, prefs.passHashVal().getOrDefault())
-            cookies.put(LoginActivity.IGNEOUS_COOKIE, prefs.igneousVal().getOrDefault())
+            cookies.put(LoginActivity.MEMBER_ID_COOKIE, prefs.memberIdVal().get()!!)
+            cookies.put(LoginActivity.PASS_HASH_COOKIE, prefs.passHashVal().get()!!)
+            cookies.put(LoginActivity.IGNEOUS_COOKIE, prefs.igneousVal().get()!!)
         }
 
         //Setup settings
diff --git a/app/src/main/java/exh/ui/lock/LockActivity.kt b/app/src/main/java/exh/ui/lock/LockActivity.kt
index e1730e574..a8e428541 100644
--- a/app/src/main/java/exh/ui/lock/LockActivity.kt
+++ b/app/src/main/java/exh/ui/lock/LockActivity.kt
@@ -5,7 +5,7 @@ import com.afollestad.materialdialogs.MaterialDialog
 import com.andrognito.pinlockview.PinLockListener
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.preference.PreferencesHelper
-import eu.kanade.tachiyomi.data.preference.nullGetOrDefault
+import eu.kanade.tachiyomi.data.preference.getOrDefault
 import eu.kanade.tachiyomi.ui.base.activity.BaseActivity
 import kotlinx.android.synthetic.main.activity_lock.*
 import uy.kohesive.injekt.injectLazy
@@ -29,12 +29,12 @@ class LockActivity : BaseActivity() {
 
         pin_lock_view.attachIndicatorDots(indicator_dots)
 
-        pin_lock_view.pinLength = prefs.lockLength().nullGetOrDefault()!!
+        pin_lock_view.pinLength = prefs.lockLength().getOrDefault()
         pin_lock_view.setPinLockListener(object : PinLockListener {
             override fun onEmpty() {}
 
             override fun onComplete(pin: String) {
-                if(sha512(pin, prefs.lockSalt().nullGetOrDefault()!!) == prefs.lockHash().nullGetOrDefault()) {
+                if(sha512(pin, prefs.lockSalt().get()!!) == prefs.lockHash().get()) {
                     //Yay!
                     finish()
                 } else {
diff --git a/app/src/main/java/exh/ui/lock/LockUtils.kt b/app/src/main/java/exh/ui/lock/LockUtils.kt
index 37edae2bf..e2e88897b 100644
--- a/app/src/main/java/exh/ui/lock/LockUtils.kt
+++ b/app/src/main/java/exh/ui/lock/LockUtils.kt
@@ -11,7 +11,7 @@ import android.provider.Settings
 import com.afollestad.materialdialogs.MaterialDialog
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.preference.PreferencesHelper
-import eu.kanade.tachiyomi.data.preference.nullGetOrDefault
+import eu.kanade.tachiyomi.data.preference.getOrDefault
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 import java.security.MessageDigest
@@ -40,9 +40,9 @@ fun sha512(passwordToHash: String, salt: String): String {
  * Check if lock is enabled
  */
 fun lockEnabled(prefs: PreferencesHelper = Injekt.get())
-    = prefs.lockHash().nullGetOrDefault() != null
-            && prefs.lockSalt().nullGetOrDefault() != null
-            && prefs.lockLength().nullGetOrDefault() != -1
+    = prefs.lockHash().get() != null
+            && prefs.lockSalt().get() != null
+            && prefs.lockLength().getOrDefault() != -1
 
 /**
  * Lock the screen