diff --git a/mobile/src/main/java/com/github/shadowsocks/ProfilesFragment.kt b/mobile/src/main/java/com/github/shadowsocks/ProfilesFragment.kt
index dc2a2d3c..d8509c05 100644
--- a/mobile/src/main/java/com/github/shadowsocks/ProfilesFragment.kt
+++ b/mobile/src/main/java/com/github/shadowsocks/ProfilesFragment.kt
@@ -148,7 +148,7 @@ class ProfilesFragment : ToolbarFragment(), Toolbar.OnMenuItemClickListener {
             }
             text1.text = item.formattedName
             val t2 = ArrayList<String>()
-            if (item.name.isNotEmpty()) t2 += item.formattedAddress
+            if (!item.name.isNullOrEmpty()) t2 += item.formattedAddress
             val id = PluginConfiguration(item.plugin ?: "").selected
             if (id.isNotEmpty()) t2 += app.getString(R.string.profile_plugin, id)
             if (t2.isEmpty()) text2.visibility = View.GONE else {
diff --git a/mobile/src/main/java/com/github/shadowsocks/bg/ProxyService.kt b/mobile/src/main/java/com/github/shadowsocks/bg/ProxyService.kt
index 8d3bd5ff..73dc4dcc 100644
--- a/mobile/src/main/java/com/github/shadowsocks/bg/ProxyService.kt
+++ b/mobile/src/main/java/com/github/shadowsocks/bg/ProxyService.kt
@@ -34,7 +34,7 @@ class ProxyService : Service(), BaseService.Interface {
 
     override val tag: String get() = "ShadowsocksProxyService"
     override fun createNotification(): ServiceNotification =
-            ServiceNotification(this, data.profile!!.name, "service-proxy", true)
+            ServiceNotification(this, data.profile!!.formattedName, "service-proxy", true)
 
     override fun onBind(intent: Intent): IBinder? = super.onBind(intent)
     override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int =
diff --git a/mobile/src/main/java/com/github/shadowsocks/bg/TransproxyService.kt b/mobile/src/main/java/com/github/shadowsocks/bg/TransproxyService.kt
index 0fd12385..f8b1e27e 100644
--- a/mobile/src/main/java/com/github/shadowsocks/bg/TransproxyService.kt
+++ b/mobile/src/main/java/com/github/shadowsocks/bg/TransproxyService.kt
@@ -33,7 +33,7 @@ class TransproxyService : Service(), LocalDnsService.Interface {
 
     override val tag: String get() = "ShadowsocksTransproxyService"
     override fun createNotification(): ServiceNotification =
-            ServiceNotification(this, data.profile!!.name, "service-transproxy", true)
+            ServiceNotification(this, data.profile!!.formattedName, "service-transproxy", true)
 
     override fun onBind(intent: Intent): IBinder? = super.onBind(intent)
     override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int =
diff --git a/mobile/src/main/java/com/github/shadowsocks/bg/VpnService.kt b/mobile/src/main/java/com/github/shadowsocks/bg/VpnService.kt
index f4381774..452ff06f 100644
--- a/mobile/src/main/java/com/github/shadowsocks/bg/VpnService.kt
+++ b/mobile/src/main/java/com/github/shadowsocks/bg/VpnService.kt
@@ -77,7 +77,7 @@ class VpnService : BaseVpnService(), LocalDnsService.Interface {
 
     override val tag: String get() = "ShadowsocksVpnService"
     override fun createNotification(): ServiceNotification =
-            ServiceNotification(this, data.profile!!.name, "service-vpn")
+            ServiceNotification(this, data.profile!!.formattedName, "service-vpn")
 
     private var conn: ParcelFileDescriptor? = null
     private var worker: ProtectWorker? = null
diff --git a/mobile/src/main/java/com/github/shadowsocks/database/Profile.kt b/mobile/src/main/java/com/github/shadowsocks/database/Profile.kt
index 3263c6b2..7202c5df 100644
--- a/mobile/src/main/java/com/github/shadowsocks/database/Profile.kt
+++ b/mobile/src/main/java/com/github/shadowsocks/database/Profile.kt
@@ -84,7 +84,7 @@ class Profile {
     var id: Int = 0
 
     @DatabaseField
-    var name: String = ""
+    var name: String? = ""
 
     @DatabaseField
     var host: String = "198.199.101.152"
@@ -135,7 +135,7 @@ class Profile {
     var plugin: String? = null
 
     val formattedAddress get() = (if (host.contains(":")) "[%s]:%d" else "%s:%d").format(host, remotePort)
-    val formattedName get() = if (name.isEmpty()) formattedAddress else name
+    val formattedName get() = if (name.isNullOrEmpty()) formattedAddress else name!!
 
     fun toUri(): Uri {
         val builder = Uri.Builder()
@@ -147,7 +147,7 @@ class Profile {
         val configuration = PluginConfiguration(plugin ?: "")
         if (configuration.selected.isNotEmpty())
             builder.appendQueryParameter(Key.plugin, configuration.selectedOptions.toString(false))
-        if (name.isNotEmpty()) builder.fragment(name)
+        if (!name.isNullOrEmpty()) builder.fragment(name)
         return builder.build()
     }
     override fun toString() = toUri().toString()