diff --git a/app/src/main/java/com/tangem/ui/fragment/BaseFragment.kt b/app/src/main/java/com/tangem/ui/fragment/BaseFragment.kt
index a56dadf42e..776d159e6b 100644
--- a/app/src/main/java/com/tangem/ui/fragment/BaseFragment.kt
+++ b/app/src/main/java/com/tangem/ui/fragment/BaseFragment.kt
@@ -78,6 +78,8 @@ abstract class BaseFragment : Fragment() {
             findNavController(this).navigate(destination, data)
         } catch (e: IllegalArgumentException) {
             Log.w(this::class.java.simpleName, e.message)
+        } catch (e: IllegalStateException) {
+            Log.w(this::class.java.simpleName, e.message)
         }
     }
 
diff --git a/app/src/main/java/com/tangem/ui/fragment/MainFragment.kt b/app/src/main/java/com/tangem/ui/fragment/MainFragment.kt
index 03478b6a7c..885ec46e70 100644
--- a/app/src/main/java/com/tangem/ui/fragment/MainFragment.kt
+++ b/app/src/main/java/com/tangem/ui/fragment/MainFragment.kt
@@ -162,17 +162,13 @@ class MainFragment : BaseFragment(), NavigationResultListener, NfcAdapter.Reader
                     cardInfo.getBundle(EXTRA_TANGEM_CARD)?.let { card.loadFromBundle(it) }
 
                     val ctx = TangemContext(card)
+
                     when {
                         card.status == TangemCard.Status.Loaded -> lastTag?.let {
                             val engineCoin = CoinEngineFactory.create(ctx)
                             if (engineCoin != null) {
                                 engineCoin.defineWallet()
 
-//                                val bundle = Bundle()
-//                                bundle.putParcelable(Constant.EXTRA_LAST_DISCOVERED_TAG, lastTag)
-//                                ctx.saveToBundle(bundle)
-//                                (activity as MainActivity).navController.navigate(R.id.loadedWallet, bundle)
-
                                 val bundle = Bundle()
                                 bundle.putParcelable(Constant.EXTRA_LAST_DISCOVERED_TAG, lastTag)
                                 ctx.saveToBundle(bundle)
@@ -202,7 +198,7 @@ class MainFragment : BaseFragment(), NavigationResultListener, NfcAdapter.Reader
             } else {
                 // remove last UIDs because of error and no card read
                 rlProgressBar.post {
-                    Toast.makeText(context, R.string.try_to_scan_again, Toast.LENGTH_SHORT).show()
+                    context?.let { Toast.makeText(it, R.string.try_to_scan_again, Toast.LENGTH_SHORT).show() }
                     unsuccessReadCount++
 
                     if (cardProtocol.error is CardProtocol.TangemException_InvalidPIN) {
diff --git a/app/src/main/java/com/tangem/ui/fragment/wallet/LoadedWalletFragment.kt b/app/src/main/java/com/tangem/ui/fragment/wallet/LoadedWalletFragment.kt
index e052f8b620..0462c8ff3d 100644
--- a/app/src/main/java/com/tangem/ui/fragment/wallet/LoadedWalletFragment.kt
+++ b/app/src/main/java/com/tangem/ui/fragment/wallet/LoadedWalletFragment.kt
@@ -499,7 +499,7 @@ class LoadedWalletFragment : BaseFragment(), NavigationResultListener, NfcAdapte
     }
 
     override fun onReadStart(cardProtocol: CardProtocol) {
-        rlProgressBar?.post { rlProgressBar.visibility = View.VISIBLE }
+        rlProgressBar?.post { rlProgressBar?.visibility = View.VISIBLE }
     }
 
     override fun onReadProgress(protocol: CardProtocol, progress: Int) {