diff --git a/Stundensheet.xlsx b/Stundensheet.xlsx
index e6b4cd14..c40ba696 100644
Binary files a/Stundensheet.xlsx and b/Stundensheet.xlsx differ
diff --git a/nsw/Source/SQL/Update_3.1.3_To_3.5.sql b/nsw/Source/SQL/Update_3.1.3_To_3.5.sql
index 6b82d173..b1e269cb 100644
--- a/nsw/Source/SQL/Update_3.1.3_To_3.5.sql
+++ b/nsw/Source/SQL/Update_3.1.3_To_3.5.sql
@@ -53,7 +53,8 @@ CREATE TABLE [dbo].[STO] (
 	[Quantity] [INT] NULL,
 	[QuantityUnit] [NVARCHAR] (16) NULL,
 	[LocationOnBoard] [NVARCHAR] (64) NULL,
-	[OfficialUse] [NVARCHAR] (16) NULL
+	[OfficialUse] [NVARCHAR] (16) NULL,
+	[Identifier] [NVARCHAR] (50) NULL
 );
 GO
 
diff --git a/nsw/Source/bsmd.database/DBManager.cs b/nsw/Source/bsmd.database/DBManager.cs
index fec3722d..7287f240 100644
--- a/nsw/Source/bsmd.database/DBManager.cs
+++ b/nsw/Source/bsmd.database/DBManager.cs
@@ -480,13 +480,16 @@ namespace bsmd.database
                 {
                     msgClass.PrepareLoadCommand(cmd, Message.LoadFilter.MESSAGEHEADER, message.Id);
                     SqlDataReader reader = this.PerformCommand(cmd);
-                    List<DatabaseEntity> statList = msgClass.LoadList(reader);
-                    foreach (DatabaseEntity derivedMessage in statList)
+                    if (reader != null)
                     {
-                        message.Elements.Add(derivedMessage);
-                        derivedMessage.MessageHeader = message;
-                        this.LoadDependingLists(derivedMessage);
-                    }                                        
+                        List<DatabaseEntity> statList = msgClass.LoadList(reader);
+                        foreach (DatabaseEntity derivedMessage in statList)
+                        {
+                            message.Elements.Add(derivedMessage);
+                            derivedMessage.MessageHeader = message;
+                            this.LoadDependingLists(derivedMessage);
+                        }
+                    }                                       
                 }
                 else
                 {
diff --git a/nsw/Source/bsmd.database/STO.cs b/nsw/Source/bsmd.database/STO.cs
index ab8a3495..5ebb6e0c 100644
--- a/nsw/Source/bsmd.database/STO.cs
+++ b/nsw/Source/bsmd.database/STO.cs
@@ -84,7 +84,7 @@ namespace bsmd.database
 
         public override void PrepareLoadCommand(IDbCommand cmd, Message.LoadFilter filter, params object[] criteria)
         {
-            string query = string.Format("SELECT Id, Name, Quantity, QuantityUnit, LocationOnBoard, OfficialUse, Identifier FROM {0}",
+            string query = string.Format("SELECT Id, Name, Quantity, QuantityUnit, LocationOnBoard, OfficialUse, Identifier FROM {0} ",
                  this.Tablename);
 
             switch (filter)
diff --git a/nsw/Source/bsmd.email/BSMDPopClient.cs b/nsw/Source/bsmd.email/BSMDPopClient.cs
index 3a786603..b6131d92 100644
--- a/nsw/Source/bsmd.email/BSMDPopClient.cs
+++ b/nsw/Source/bsmd.email/BSMDPopClient.cs
@@ -82,6 +82,11 @@ namespace bsmd.email
                         attachmentLocalFile = Path.Combine(Properties.Settings.Default.ArchiveFolder, part.FileName);
                         part.Save(new FileInfo(attachmentLocalFile));
                     }
+                    else if (part.FileName.EndsWith(".xlsx", StringComparison.InvariantCultureIgnoreCase))
+                    {
+                        attachmentLocalFile = Path.Combine(Properties.Settings.Default.ArchiveFolder, part.FileName);
+                        part.Save(new FileInfo(attachmentLocalFile));
+                    }
                 }
 
                 this.currentMail++; // advance message pointer