diff --git a/ENI2/DetailViewControls/OverViewDetailControl.xaml.cs b/ENI2/DetailViewControls/OverViewDetailControl.xaml.cs
index 6b1bcd4c..4b3f3f57 100644
--- a/ENI2/DetailViewControls/OverViewDetailControl.xaml.cs
+++ b/ENI2/DetailViewControls/OverViewDetailControl.xaml.cs
@@ -871,7 +871,7 @@ namespace ENI2.DetailViewControls
                         break;
                     case NotificationClass.INFO:
                         if (Core.PoC == "DEHAM") addToSend = false;
-                        else addToSend = ((message.ViolationCount ?? 0) > 0);
+                        else addToSend = !((message.ViolationCount ?? 0) > 0);
                         break;
                      default:
                         if((message.ViolationCount ?? 0) > 0) addToSend = false; 
diff --git a/bsmd.database/INFO.cs b/bsmd.database/INFO.cs
index 8f7b46bd..294a5e6e 100644
--- a/bsmd.database/INFO.cs
+++ b/bsmd.database/INFO.cs
@@ -216,9 +216,8 @@ namespace bsmd.database
                         errors.Add(RuleEngine.CreateError(ValidationCode.IMPLAUSIBLE, "PortArea", this.PortArea, "INFO", "", this.Tablename));
             }
             else
-            {
-                if(this.MessageCore.PoC != "DEHAM")
-                    errors.Add(RuleEngine.CreateError(ValidationCode.PORTAREA, "PortArea", this.PortArea ?? "", "INFO", "", this.Tablename));
+            {                
+                errors.Add(RuleEngine.CreateError(ValidationCode.PORTAREA, "PortArea", this.PortArea ?? "", "INFO", "", this.Tablename));
             }
 
             if(DeplacementSummerDraught_TNE.HasValue)
diff --git a/bsmd.database/WAS_RCPT.cs b/bsmd.database/WAS_RCPT.cs
index 178c0bfd..9abfad47 100644
--- a/bsmd.database/WAS_RCPT.cs
+++ b/bsmd.database/WAS_RCPT.cs
@@ -146,6 +146,13 @@ namespace bsmd.database
                     };
                     this.WasteReceived.Add(foundWasteReceived);
                 }
+                else
+                {
+                    if (!foundWasteReceived.AmountWasteReceived_MTQ.HasValue)
+                    {
+                        foundWasteReceived.AmountWasteReceived_MTQ = 0;
+                    }
+                }
 
                 if (foundWasteReceived.WasteDescription.IsNullOrEmpty())
                 {