diff --git a/src/generic/timectrlg.cpp b/src/generic/timectrlg.cpp
index e474338db6..445446e511 100644
--- a/src/generic/timectrlg.cpp
+++ b/src/generic/timectrlg.cpp
@@ -446,6 +446,7 @@ private:
 
             case Field_Max:
                 wxFAIL_MSG( "Invalid field" );
+                return;
         }
 
         UpdateText();
@@ -531,6 +532,7 @@ private:
             case Field_AMPM:
             case Field_Max:
                 wxFAIL_MSG( "Invalid field" );
+                return;
         }
 
         if ( moveToNextField && m_currentField < Field_Sec )