diff --git a/app/build.gradle b/app/build.gradle
index 481c2f578..8b27c96b9 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -27,8 +27,8 @@ android {
         applicationId "io.github.nekoinverter.ehviewer"
         minSdkVersion 21
         targetSdkVersion 30
-        versionCode 120
-        versionName "1.7.16"
+        versionCode 121
+        versionName "1.7.17"
         resConfigs "zh", "zh-rCN", "zh-rHK", "zh-rTW",
                 "es", "ja", "ko", "fr", "de", "th"
         testOptions.unitTests.includeAndroidResources = true
diff --git a/app/src/main/java/com/hippo/ehviewer/client/EhTagDatabase.java b/app/src/main/java/com/hippo/ehviewer/client/EhTagDatabase.java
index 19ea95557..2975ae790 100644
--- a/app/src/main/java/com/hippo/ehviewer/client/EhTagDatabase.java
+++ b/app/src/main/java/com/hippo/ehviewer/client/EhTagDatabase.java
@@ -78,13 +78,17 @@ public class EhTagDatabase {
     public EhTagDatabase(String name, BufferedSource source) throws IOException {
         this.name = name;
         String[] tmp;
-        StringBuilder buffer = new StringBuilder();
+        StringBuilder buffer = new StringBuilder("");
         source.readInt();
         for (String i : source.readUtf8().split("\n")) {
             tmp = i.split("\r", 2);
             buffer.append(tmp[0]);
             buffer.append("\r");
-            buffer.append(new String(Base64.decode(tmp[1], Base64.DEFAULT), TextUrl.UTF_8));
+            try {
+                buffer.append(new String(Base64.decode(tmp[1], Base64.DEFAULT), TextUrl.UTF_8));
+            } catch (Exception e) {
+                buffer.append(tmp[1]);
+            }
             buffer.append("\n");
         }
         byte[] b = buffer.toString().getBytes(TextUrl.UTF_8);