diff --git a/ScpCleanWipe/MainWindow.xaml.cs b/ScpCleanWipe/MainWindow.xaml.cs
index 7396b57a..4bc33318 100644
--- a/ScpCleanWipe/MainWindow.xaml.cs
+++ b/ScpCleanWipe/MainWindow.xaml.cs
@@ -27,6 +27,12 @@ public partial class MainWindow : Window
         public MainWindow()
         {
             InitializeComponent();
+
+            AppDomain.CurrentDomain.UnhandledException += (sender, args) =>
+            {
+                MessageBox.Show(((Exception) args.ExceptionObject).Message, "Exception",
+                    MessageBoxButton.OK, MessageBoxImage.Error);
+            };
         }
 
         #region Windows Service Helpers
@@ -124,6 +130,12 @@ await Task.Run(() =>
                     DrvStore.DeletePackage(entry, true);
                 }
 
+                foreach (var entry in storeEntries.Where(dse => dse.DriverPkgProvider.Contains("MotioninJoy")))
+                {
+                    Log.InfoFormat("Removing package from driver store: {0} by {1}", entry.DriverPublishedName, entry.DriverPkgProvider);
+                    DrvStore.DeletePackage(entry, true);
+                }
+
                 #endregion
 
                 #region Driver uninstallation