diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DateTimeUpDown/DateTimeUpDown.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DateTimeUpDown/DateTimeUpDown.cs
index 6eedb5d7..0af73e15 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DateTimeUpDown/DateTimeUpDown.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DateTimeUpDown/DateTimeUpDown.cs
@@ -59,14 +59,6 @@ namespace Microsoft.Windows.Controls
             InitializeDateTimeInfoList();
         }
 
-        protected override void OnValueChanged(object oldValue, object newValue)
-        {
-            //whenever the value changes we need to parse out the value into out DateTimeInfo segments so we can keep track of the individual pieces
-            ParseValueIntoDateTimeInfo();
-
-            base.OnValueChanged(oldValue, newValue);
-        }
-
         #endregion //Constructors
 
         #region Base Class Overrides
@@ -85,6 +77,14 @@ namespace Microsoft.Windows.Controls
             base.OnPreviewKeyDown(e);
         }
 
+        protected override void OnValueChanged(object oldValue, object newValue)
+        {
+            //whenever the value changes we need to parse out the value into out DateTimeInfo segments so we can keep track of the individual pieces
+            ParseValueIntoDateTimeInfo();
+
+            base.OnValueChanged(oldValue, newValue);
+        }
+
         protected override object OnCoerceValue(object value)
         {
             //if the user entered a string value to represent a date or time, we need to parse that string into a valid DatTime value
@@ -378,6 +378,12 @@ namespace Microsoft.Windows.Controls
         {
             _fireSelectionChangedEvent = false;
             DateTimeInfo info = _selectedDateTimeInfo;
+
+            //this only occurs when the user manually type in a value for the Value Property
+            if (info == null)
+                info = _dateTimeInfoList[0];
+
+
             switch (info.Type)
             {
                 case DateTimePart.Year: