diff --git a/app/src/main/java/jp/juggler/subwaytooter/api/entity/TootAccount.kt b/app/src/main/java/jp/juggler/subwaytooter/api/entity/TootAccount.kt
index bf689194..25f599c5 100644
--- a/app/src/main/java/jp/juggler/subwaytooter/api/entity/TootAccount.kt
+++ b/app/src/main/java/jp/juggler/subwaytooter/api/entity/TootAccount.kt
@@ -349,7 +349,10 @@ open class TootAccount(parser : TootParser, src : JSONObject) {
 		internal val reAccountUrl : Pattern =
 			Pattern.compile("""\Ahttps://(\w[\w.-]*\w)/@(\w+[\w-]*)(?:@(\w[\w.-]*\w))?(?=\z|[?#])""")
 		
-		fun getAcctFromUrl(url : String) : String? {
+		fun getAcctFromUrl(url : String?) : String? {
+
+			url ?: return null
+
 			val m = reAccountUrl.matcher(url)
 			return if(m.find()) {
 				val host = m.group(1)
diff --git a/app/src/main/java/jp/juggler/subwaytooter/util/HTMLDecoder.kt b/app/src/main/java/jp/juggler/subwaytooter/util/HTMLDecoder.kt
index 543dc1ee..48719f6e 100644
--- a/app/src/main/java/jp/juggler/subwaytooter/util/HTMLDecoder.kt
+++ b/app/src/main/java/jp/juggler/subwaytooter/util/HTMLDecoder.kt
@@ -396,10 +396,11 @@ object HTMLDecoder {
 				when(display_url[0]) {
 					'@' -> {
 						// @mention
-						if(href != null && (options.mentionFullAcct || Pref.bpMentionFullAcct(App1.pref))) {
+						if(options.mentionFullAcct || Pref.bpMentionFullAcct(App1.pref)) {
 							val acct = TootAccount.getAcctFromUrl(href)
 							if(acct != null) return "@$acct"
 						}
+						
 						return display_url
 					}