diff --git a/DiscImageChef.Core/Sidecar/Sidecar.cs b/DiscImageChef.Core/Sidecar/Sidecar.cs
index 2c4db69ea..d63805fd1 100644
--- a/DiscImageChef.Core/Sidecar/Sidecar.cs
+++ b/DiscImageChef.Core/Sidecar/Sidecar.cs
@@ -64,7 +64,7 @@ namespace DiscImageChef.Core
 
             // For fast debugging, skip checksum
             //goto skipImageChecksum;
-/*
+
             byte[] data;
             long   position = 0;
             InitProgress();
@@ -90,7 +90,7 @@ namespace DiscImageChef.Core
             // For fast debugging, skip checksum
             //skipImageChecksum:
 
-            EndProgress();*/
+            EndProgress();
             fs.Close();
 
             List<ChecksumType> imgChecksums = imgChkWorker.End();
diff --git a/DiscImageChef.Filesystems/ISO9660/Info.cs b/DiscImageChef.Filesystems/ISO9660/Info.cs
index 375c1ac8d..3607c1d0e 100644
--- a/DiscImageChef.Filesystems/ISO9660/Info.cs
+++ b/DiscImageChef.Filesystems/ISO9660/Info.cs
@@ -756,30 +756,45 @@ namespace DiscImageChef.Filesystems.ISO9660
             {
                 XmlFsType.VolumeName = decodedJolietVd.VolumeIdentifier;
 
-                if(decodedJolietVd.SystemIdentifier  == null ||
+                if(string.IsNullOrEmpty(decodedJolietVd.SystemIdentifier) ||
                    decodedVd.SystemIdentifier.Length > decodedJolietVd.SystemIdentifier.Length)
-                    XmlFsType.SystemIdentifier  = decodedVd.SystemIdentifier;
-                else XmlFsType.SystemIdentifier = decodedJolietVd.SystemIdentifier;
+                    XmlFsType.SystemIdentifier = decodedVd.SystemIdentifier;
+                else
+                    XmlFsType.SystemIdentifier = string.IsNullOrEmpty(decodedJolietVd.SystemIdentifier)
+                                                     ? null
+                                                     : decodedJolietVd.SystemIdentifier;
 
-                if(decodedJolietVd.VolumeSetIdentifier == null || decodedVd.VolumeSetIdentifier.Length >
+                if(string.IsNullOrEmpty(decodedJolietVd.VolumeSetIdentifier) || decodedVd.VolumeSetIdentifier.Length >
                    decodedJolietVd.VolumeSetIdentifier.Length)
-                    XmlFsType.VolumeSetIdentifier  = decodedVd.VolumeSetIdentifier;
-                else XmlFsType.VolumeSetIdentifier = decodedJolietVd.VolumeSetIdentifier;
+                    XmlFsType.VolumeSetIdentifier = decodedVd.VolumeSetIdentifier;
+                else
+                    XmlFsType.VolumeSetIdentifier = string.IsNullOrEmpty(decodedJolietVd.VolumeSetIdentifier)
+                                                        ? null
+                                                        : decodedJolietVd.VolumeSetIdentifier;
 
-                if(decodedJolietVd.PublisherIdentifier == null || decodedVd.PublisherIdentifier.Length >
+                if(string.IsNullOrEmpty(decodedJolietVd.PublisherIdentifier) || decodedVd.PublisherIdentifier.Length >
                    decodedJolietVd.PublisherIdentifier.Length)
-                    XmlFsType.PublisherIdentifier  = decodedVd.PublisherIdentifier;
-                else XmlFsType.PublisherIdentifier = decodedJolietVd.PublisherIdentifier;
+                    XmlFsType.PublisherIdentifier = decodedVd.PublisherIdentifier;
+                else
+                    XmlFsType.PublisherIdentifier = string.IsNullOrEmpty(decodedJolietVd.PublisherIdentifier)
+                                                        ? null
+                                                        : decodedJolietVd.PublisherIdentifier;
 
-                if(decodedJolietVd.DataPreparerIdentifier == null || decodedVd.DataPreparerIdentifier.Length >
-                   decodedJolietVd.DataPreparerIdentifier.Length)
-                    XmlFsType.DataPreparerIdentifier  = decodedVd.DataPreparerIdentifier;
-                else XmlFsType.DataPreparerIdentifier = decodedJolietVd.DataPreparerIdentifier;
+                if(string.IsNullOrEmpty(decodedJolietVd.DataPreparerIdentifier) ||
+                   decodedVd.DataPreparerIdentifier.Length > decodedJolietVd.DataPreparerIdentifier.Length)
+                    XmlFsType.DataPreparerIdentifier = decodedVd.DataPreparerIdentifier;
+                else
+                    XmlFsType.DataPreparerIdentifier = string.IsNullOrEmpty(decodedJolietVd.DataPreparerIdentifier)
+                                                           ? null
+                                                           : decodedJolietVd.DataPreparerIdentifier;
 
-                if(decodedJolietVd.ApplicationIdentifier == null || decodedVd.ApplicationIdentifier.Length >
-                   decodedJolietVd.ApplicationIdentifier.Length)
-                    XmlFsType.ApplicationIdentifier  = decodedVd.ApplicationIdentifier;
-                else XmlFsType.ApplicationIdentifier = decodedJolietVd.ApplicationIdentifier;
+                if(string.IsNullOrEmpty(decodedJolietVd.ApplicationIdentifier) ||
+                   decodedVd.ApplicationIdentifier.Length > decodedJolietVd.ApplicationIdentifier.Length)
+                    XmlFsType.ApplicationIdentifier = decodedVd.ApplicationIdentifier;
+                else
+                    XmlFsType.ApplicationIdentifier = string.IsNullOrEmpty(decodedJolietVd.ApplicationIdentifier)
+                                                          ? null
+                                                          : decodedJolietVd.ApplicationIdentifier;
 
                 XmlFsType.CreationDate          = decodedJolietVd.CreationTime;
                 XmlFsType.CreationDateSpecified = true;