diff --git a/.idea/.idea.DiscImageChef/.idea/contentModel.xml b/.idea/.idea.DiscImageChef/.idea/contentModel.xml
index 796e95896..30bf51e36 100644
--- a/.idea/.idea.DiscImageChef/.idea/contentModel.xml
+++ b/.idea/.idea.DiscImageChef/.idea/contentModel.xml
@@ -7,6 +7,9 @@
     <e p="$USER_HOME$/.Rider2018.2/system/resharper-host/local/Transient/ReSharperHost/v182/SolutionCaches/_DiscImageChef.73225794.00" t="ExcludeRecursive" />
     <e p="$USER_HOME$/.nuget/packages/sqlitepclraw.lib.e_sqlite3.linux/1.1.11/runtimes/linux-x64/native/libe_sqlite3.so" t="Include" />
     <e p="$PROJECT_DIR$" t="IncludeFlat">
+      <e p=".git/info/exclude" t="IncludeRecursive" />
+      <e p=".git/modules/CICMMetadata/info/exclude" t="IncludeRecursive" />
+      <e p=".git/modules/cuetoolsnet/info/exclude" t="IncludeRecursive" />
       <e p=".github/CODE_OF_CONDUCT.md" t="Include" />
       <e p=".github/ISSUE_TEMPLATE.md" t="Include" />
       <e p=".github/PULL_REQUEST_TEMPLATE.md" t="Include" />
@@ -1312,7 +1315,6 @@
           <e p="Logos" t="Include">
             <e p="Media" t="Include">
               <e p=".directory" t="Include" />
-              <e p="360DVDfirmwareRelatedInfo.pdf" t="Include" />
               <e p="AIT1.png" t="Include" />
               <e p="AIT1.svg" t="Include" />
               <e p="AIT1Turbo.png" t="Include" />
diff --git a/DiscImageChef.Devices/Windows/ListDevices.cs b/DiscImageChef.Devices/Windows/ListDevices.cs
index cdde3a351..fe858cdd1 100644
--- a/DiscImageChef.Devices/Windows/ListDevices.cs
+++ b/DiscImageChef.Devices/Windows/ListDevices.cs
@@ -34,12 +34,12 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
-#if !NETSTANDARD2_0
-using System.Management;
-#endif
 using System.Runtime.InteropServices;
 using System.Text;
 using Microsoft.Win32.SafeHandles;
+#if !NETSTANDARD2_0
+using System.Management;
+#endif
 
 namespace DiscImageChef.Devices.Windows
 {
@@ -96,9 +96,9 @@ namespace DiscImageChef.Devices.Windows
                 throw;
                 #else
                 return null;
-#endif
+                #endif
             }
-    #endif
+            #endif
 
             List<DeviceInfo> devList = new List<DeviceInfo>();
 
@@ -172,7 +172,7 @@ namespace DiscImageChef.Devices.Windows
                        info.Serial.Length == 40) info.Serial = HexStringToString(info.Serial).Trim();
                 }
 
-                if(string.IsNullOrEmpty(info.Vendor) || info.Vendor == "ATA")
+                if((string.IsNullOrEmpty(info.Vendor) || info.Vendor == "ATA") && info.Model != null)
                 {
                     string[] pieces = info.Model.Split(' ');
                     if(pieces.Length > 1)