diff --git a/library/language/source/main.php b/library/language/source/main.php
index 263e13c54..c501387bd 100644
--- a/library/language/source/main.php
+++ b/library/language/source/main.php
@@ -1065,7 +1065,6 @@ $lang['BT_UNREGISTERED_ALREADY'] = 'Torrent already unregistered';
 $lang['BT_REGISTERED'] = 'Torrent registered on tracker<br /><br />Now you need to <a href="%s"><b>download your torrent</b></a> and run it using your BitTorrent client choosing the folder with the original files you\'re sharing as the download path';
 $lang['INVALID_ANN_URL'] = 'Invalid Announce URL [%s]<br /><br />must be <b>%s</b>';
 $lang['PASSKEY_ERR_TOR_NOT_REG'] = 'Could not add passkey<br /><br />Torrent not registered on tracker';
-$lang['PASSKEY_ERR_EMPTY'] = 'Could not add passkey (passkey is empty)<br /><br />Go to <a href="%s" target="_blank"><b>your forum profile</b></a> and generate it';
 $lang['BT_PASSKEY'] = 'Passkey';
 $lang['BT_GEN_PASSKEY'] = 'create a new';
 $lang['BT_PASSKEY_VIEW'] = 'show';
diff --git a/src/Legacy/Common/User.php b/src/Legacy/Common/User.php
index 16ededb71..3ad513eba 100644
--- a/src/Legacy/Common/User.php
+++ b/src/Legacy/Common/User.php
@@ -253,7 +253,7 @@ class User
         // Generate passkey
         if (!\TorrentPier\Legacy\Torrent::getPasskey($this->data['user_id'])) {
             if (!\TorrentPier\Legacy\Torrent::generate_passkey($this->data['user_id'], true)) {
-                bb_die('Could not generate passkey');
+                bb_simple_die('Could not generate passkey');
             }
         }
 
diff --git a/src/Legacy/Torrent.php b/src/Legacy/Torrent.php
index 4fcd032ec..f9a7349bd 100644
--- a/src/Legacy/Torrent.php
+++ b/src/Legacy/Torrent.php
@@ -543,7 +543,7 @@ class Torrent
 
         $file_contents = file_get_contents($filename);
         if (!$tor = \Arokettu\Bencode\Bencode::decode($file_contents)) {
-            bb_die('This is not a bencoded file');
+            bb_die($lang['TORFILE_INVALID']);
         }
 
         $announce = $bb_cfg['ocelot']['enabled'] ? (string)($bb_cfg['ocelot']['url'] . $passkey_val . "/announce") : (string)($ann_url . "?$passkey_key=$passkey_val");