diff --git a/ENI-2/ENI2/ENI2/DetailViewControls/WasteDetailControl.xaml.cs b/ENI-2/ENI2/ENI2/DetailViewControls/WasteDetailControl.xaml.cs
index 18f7d81f..082e719e 100644
--- a/ENI-2/ENI2/ENI2/DetailViewControls/WasteDetailControl.xaml.cs
+++ b/ENI-2/ENI2/ENI2/DetailViewControls/WasteDetailControl.xaml.cs
@@ -261,27 +261,27 @@ namespace ENI2.DetailViewControls
                                 Waste waste = new Waste();
 
 
-                                if (!reader.IsDBNull(1)) o = reader.GetValue(1);
+                                if (!reader.IsDBNull(1)) o = reader.GetValue(1); else o = null;
                                 if (o != null) waste.WasteType = Convert.ToInt32(o);
 
                                 if (!reader.IsDBNull(3)) waste.WasteDescription = reader.GetString(3);
 
-                                if (!reader.IsDBNull(4)) o = reader.GetValue(4);
+                                if (!reader.IsDBNull(4)) o = reader.GetValue(4); else o = null;
                                 if (o != null) waste.WasteDisposalAmount_MTQ = Convert.ToDouble(o);
 
-                                if (!reader.IsDBNull(5)) o = reader.GetValue(5);
+                                if (!reader.IsDBNull(5)) o = reader.GetValue(5); else o = null;
                                 if (o != null) waste.WasteCapacity_MTQ = Convert.ToDouble(o);
 
-                                if (!reader.IsDBNull(6)) o = reader.GetValue(6);
+                                if (!reader.IsDBNull(6)) o = reader.GetValue(6); else o = null;
                                 if (o != null) waste.WasteAmountRetained_MTQ = Convert.ToDouble(o);
 
                                 if (!reader.IsDBNull(7)) waste.WasteDisposalPort = reader.GetString(7);
 
-                                if (!reader.IsDBNull(8)) o = reader.GetValue(8);
+                                if (!reader.IsDBNull(8)) o = reader.GetValue(8); else o = null;
                                 if (o != null) waste.WasteAmountGeneratedTillNextPort_MTQ = Convert.ToDouble(o);
 
-                                if (!reader.IsDBNull(9)) o = reader.GetValue(9);
-                                if (o != null) waste.WasteDisposedAtLastPort_MTQ = Convert.ToDouble(9);
+                                if (!reader.IsDBNull(9)) o = reader.GetValue(9); else o = null;
+                                if (o != null) waste.WasteDisposedAtLastPort_MTQ = Convert.ToDouble(o);
 
                                 waste.WAS = this._was;
                                 waste.IsDirty = true;
diff --git a/ENI-2/ENI2/ENI2/ENI2.csproj b/ENI-2/ENI2/ENI2/ENI2.csproj
index 10761680..be5587b7 100644
--- a/ENI-2/ENI2/ENI2/ENI2.csproj
+++ b/ENI-2/ENI2/ENI2/ENI2.csproj
@@ -35,8 +35,8 @@
     <MinimumRequiredVersion>3.5.1.0</MinimumRequiredVersion>
     <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
     <WebPage>publish.html</WebPage>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>5.0.9.%2a</ApplicationVersion>
+    <ApplicationRevision>2</ApplicationRevision>
+    <ApplicationVersion>5.0.10.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
     <PublishWizardCompleted>true</PublishWizardCompleted>
diff --git a/Stundensheet.xlsx b/Stundensheet.xlsx
index c54c644d..4fa95575 100644
Binary files a/Stundensheet.xlsx and b/Stundensheet.xlsx differ
diff --git a/nsw/Source/bsmd.database/MessageCore.cs b/nsw/Source/bsmd.database/MessageCore.cs
index 19fedb79..483e5c73 100644
--- a/nsw/Source/bsmd.database/MessageCore.cs
+++ b/nsw/Source/bsmd.database/MessageCore.cs
@@ -520,7 +520,7 @@ namespace bsmd.database
                             if(searchDict.ContainsKey(SearchFilterType.FILTER_ETA))
                             {
                                 // perform NOA_NOD join
-                                sb.Append(" LEFT JOIN MessageHeader mh ON mh.MessageCoreId = MessageCore.Id AND mh.NotificationClass = 2 LEFT JOIN NOA_NOD ON MessageHeaderId = mh.Id");
+                                sb.Append(" LEFT JOIN MessageHeader mh2 ON mh2.MessageCoreId = MessageCore.Id AND mh2.NotificationClass = 2 LEFT JOIN NOA_NOD ON NOA_NOD.MessageHeaderId = mh2.Id");
                             }
 
                             sb.Append(" WHERE ");