diff --git a/src/BreCalClient/EditTimesAgencyIncomingControl.xaml.cs b/src/BreCalClient/EditTimesAgencyIncomingControl.xaml.cs
index 511aa3a..c602978 100644
--- a/src/BreCalClient/EditTimesAgencyIncomingControl.xaml.cs
+++ b/src/BreCalClient/EditTimesAgencyIncomingControl.xaml.cs
@@ -93,6 +93,10 @@ namespace BreCalClient
                 {
                     this.ShipcallModel.Shipcall.PierSide = (this.comboBoxPierside.SelectedIndex == 0) ? true : false;
                 }
+                else
+                {
+                    this.ShipcallModel.Shipcall.PierSide = null;
+                }
 
                 this.Times.BerthInfo = this.textBoxBerthRemarks.Text.Trim();                
                 this.Times.BerthId = (int?)this.comboBoxArrivalBerth.SelectedValue;               
diff --git a/src/BreCalClient/EditTimesAgencyOutgoingControl.xaml.cs b/src/BreCalClient/EditTimesAgencyOutgoingControl.xaml.cs
index 4cb0909..47301f7 100644
--- a/src/BreCalClient/EditTimesAgencyOutgoingControl.xaml.cs
+++ b/src/BreCalClient/EditTimesAgencyOutgoingControl.xaml.cs
@@ -91,7 +91,11 @@ namespace BreCalClient
                 {
                     this.ShipcallModel.Shipcall.PierSide = (this.comboBoxPierside.SelectedIndex == 0) ? true : false;
                 }
-                
+                else
+                {
+                    this.ShipcallModel.Shipcall.PierSide = null;
+                }
+
                 this.Times.BerthId = (int?)this.comboBoxDepartureBerth.SelectedValue;
                 
                 this.Times.BerthInfo = this.textBoxBerthRemarks.Text.Trim();
diff --git a/src/BreCalClient/EditTimesAgencyShiftingControl.xaml.cs b/src/BreCalClient/EditTimesAgencyShiftingControl.xaml.cs
index f8c68b7..8c0cfcc 100644
--- a/src/BreCalClient/EditTimesAgencyShiftingControl.xaml.cs
+++ b/src/BreCalClient/EditTimesAgencyShiftingControl.xaml.cs
@@ -94,6 +94,10 @@ namespace BreCalClient
                 {
                     this.ShipcallModel.Shipcall.PierSide = (this.comboBoxPiersideArrival.SelectedIndex == 0) ? true : false;
                 }
+                else
+                {
+                    this.ShipcallModel.Shipcall.PierSide = null;
+                }
 
                 this.Times.BerthInfo = this.textBoxBerthRemarksArrival.Text.Trim();                
                 this.Times.BerthId = (int?)this.comboBoxArrivalBerth.SelectedValue;                
diff --git a/src/BreCalClient/Resources/Resources.de.resx b/src/BreCalClient/Resources/Resources.de.resx
index 89242df..fcd4530 100644
--- a/src/BreCalClient/Resources/Resources.de.resx
+++ b/src/BreCalClient/Resources/Resources.de.resx
@@ -424,7 +424,7 @@
   <data name="textPort" xml:space="preserve">
     <value>Backbord</value>
   </data>
-  <data name="textStarBoard" xml:space="preserve">
+  <data name="textStarboard" xml:space="preserve">
     <value>Steuerbord</value>
   </data>
 </root>
\ No newline at end of file