diff --git a/app/src/main/java/com/hippo/ehviewer/Settings.java b/app/src/main/java/com/hippo/ehviewer/Settings.java
index 0d31bbdf8..15c217511 100644
--- a/app/src/main/java/com/hippo/ehviewer/Settings.java
+++ b/app/src/main/java/com/hippo/ehviewer/Settings.java
@@ -792,6 +792,9 @@ public static String getImageResolution() {
     }
 
     public static void putImageResolution(String value) {
+        if(null==value){
+            return;
+        }
         sEhConfig.imageSize = value;
         sEhConfig.setDirty();
         putString(KEY_IMAGE_RESOLUTION, value);
diff --git a/app/src/main/java/com/hippo/ehviewer/client/EhClient.java b/app/src/main/java/com/hippo/ehviewer/client/EhClient.java
index 0081b9529..36394b4f1 100644
--- a/app/src/main/java/com/hippo/ehviewer/client/EhClient.java
+++ b/app/src/main/java/com/hippo/ehviewer/client/EhClient.java
@@ -19,6 +19,7 @@
 import android.content.Context;
 import android.os.AsyncTask;
 
+import com.google.firebase.crashlytics.FirebaseCrashlytics;
 import com.hippo.ehviewer.EhApplication;
 import com.hippo.ehviewer.client.data.userTag.TagPushParam;
 import com.hippo.ehviewer.client.data.userTag.UserTag;
@@ -218,6 +219,7 @@ protected void onPostExecute(Object result) {
                 if (!(result instanceof CancelledException)) {
                     if (result instanceof Exception) {
                         mCallback.onFailure((Exception) result);
+                        FirebaseCrashlytics.getInstance().recordException((Throwable) result);
                     } else {
                         mCallback.onSuccess(result);
                     }
diff --git a/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryListParser.java b/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryListParser.java
index 97dc8ba08..c8f980351 100644
--- a/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryListParser.java
+++ b/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryListParser.java
@@ -76,7 +76,7 @@ public static class Result {
         public String nextHref;
         public String lastHref;
         public boolean noWatchedTags;
-        public List<GalleryInfo> galleryInfoList;
+        public List<GalleryInfo> galleryInfoList = new ArrayList<>();
     }
 
     private static int parsePages(Document d, String body) throws ParseException {
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/dialog/FavoriteListSortDialog.java b/app/src/main/java/com/hippo/ehviewer/ui/dialog/FavoriteListSortDialog.java
index 4ff47d96b..09d30f503 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/dialog/FavoriteListSortDialog.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/dialog/FavoriteListSortDialog.java
@@ -18,7 +18,7 @@ public FavoriteListSortDialog(FavoritesScene scene) {
 
     public void showCloudSort(FavoritesParser.Result mResult) {
         int checked;
-        if (null == mResult.favOrder) {
+        if (null == mResult || null == mResult.favOrder) {
             return;
         }
         if (mResult.favOrder.equals(ORDER_BY_FAV_TIME)) {
diff --git a/app/src/main/java/com/hippo/widget/ContentLayout.java b/app/src/main/java/com/hippo/widget/ContentLayout.java
index 33d329ba7..940e2ef3c 100644
--- a/app/src/main/java/com/hippo/widget/ContentLayout.java
+++ b/app/src/main/java/com/hippo/widget/ContentLayout.java
@@ -88,13 +88,13 @@ public ContentLayout(Context context, AttributeSet attrs, int defStyleAttr) {
     private void init(Context context) {
         LayoutInflater.from(context).inflate(R.layout.widget_content_layout, this);
 
-        mProgressView = (ProgressView) findViewById(R.id.progress);
-        mTipView = (TextView) findViewById(R.id.tip);
-        mContentView = (ViewGroup) findViewById(R.id.content_view);
+        mProgressView = findViewById(R.id.progress);
+        mTipView = findViewById(R.id.tip);
+        mContentView = findViewById(R.id.content_view);
 
-        mRefreshLayout = (RefreshLayout) mContentView.findViewById(R.id.refresh_layout);
-        mFastScroller = (FastScroller) mContentView.findViewById(R.id.fast_scroller);
-        mRecyclerView = (EasyRecyclerView) mRefreshLayout.findViewById(R.id.recycler_view);
+        mRefreshLayout = mContentView.findViewById(R.id.refresh_layout);
+        mFastScroller = mContentView.findViewById(R.id.fast_scroller);
+        mRecyclerView = mRefreshLayout.findViewById(R.id.recycler_view);
 
         mFastScroller.attachToRecyclerView(mRecyclerView);
         HandlerDrawable drawable = new HandlerDrawable();