diff --git a/app/build.gradle b/app/build.gradle
index ecd9280df0..a816d07423 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -120,7 +120,7 @@ dependencies {
 
     implementation 'com.android.support:multidex:1.0.2'
 
-    standardImplementation 'com.google.firebase:firebase-core:12.0.1'
+    standardImplementation 'com.google.firebase:firebase-core:11.8.0'
 
     // ReactiveX
     implementation 'io.reactivex:rxandroid:1.2.1'
@@ -155,7 +155,7 @@ dependencies {
 
     // Job scheduling
     implementation 'com.evernote:android-job:1.2.4'
-    implementation 'com.google.android.gms:play-services-gcm:12.0.1'
+    implementation 'com.google.android.gms:play-services-gcm:11.8.0'
 
     // Changelog
     implementation 'com.github.gabrielemariotti.changeloglib:changelog:2.1.0'
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/base/presenter/BasePresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/base/presenter/BasePresenter.kt
index cfe4191d95..130362f51b 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/base/presenter/BasePresenter.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/base/presenter/BasePresenter.kt
@@ -1,11 +1,21 @@
 package eu.kanade.tachiyomi.ui.base.presenter
 
+import android.os.Bundle
 import nucleus.presenter.RxPresenter
 import nucleus.presenter.delivery.Delivery
 import rx.Observable
 
 open class BasePresenter<V> : RxPresenter<V>() {
 
+    override fun onCreate(savedState: Bundle?) {
+        try {
+            super.onCreate(savedState)
+        } catch (e: NullPointerException) {
+            // Swallow this error. This should be fixed in the library but since it's not critical
+            // (only used by restartables) it should be enough. It saves me a fork.
+        }
+    }
+
     /**
      * Subscribes an observable with [deliverFirst] and adds it to the presenter's lifecycle
      * subscription list.