diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index 1dcd875875..af6cb5a5d7 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,3 +1,9 @@
+2008-12-19	Joel Sherrill <joel.sherrill@oarcorp.com>
+
+	* rtems/src/dpmemcreate.c: Spacing.
+	* rtems/src/timerserver.c: Move error check to RTEMS_DEBUG. Cannot
+	happen under normal circumstances.
+
 2008-12-19	Sebastian Huber <sebastian.huber@embedded-brains.de>
 
 	* libblock/src/ide_part_table.c: Fixed NULL pointer access.
diff --git a/cpukit/rtems/src/dpmemcreate.c b/cpukit/rtems/src/dpmemcreate.c
index 37afc59e87..789f075a6b 100644
--- a/cpukit/rtems/src/dpmemcreate.c
+++ b/cpukit/rtems/src/dpmemcreate.c
@@ -53,7 +53,7 @@ rtems_status_code rtems_port_create(
 {
   register Dual_ported_memory_Control *the_port;
 
-  if ( !rtems_is_name_valid( name) )
+  if ( !rtems_is_name_valid( name ) )
     return RTEMS_INVALID_NAME;
 
   if ( !id )
diff --git a/cpukit/rtems/src/timerserver.c b/cpukit/rtems/src/timerserver.c
index 5f4b318e35..7e48a3d57a 100644
--- a/cpukit/rtems/src/timerserver.c
+++ b/cpukit/rtems/src/timerserver.c
@@ -465,7 +465,8 @@ rtems_status_code rtems_timer_initiate_server(
     (rtems_task_entry) _Timer_Server_body, /* the timer server entry point */
     0                                      /* there is no argument */
   );
-  if (status) {
+  
+  #if defined(RTEMS_DEBUG)
     /*
      *  One would expect a call to rtems_task_delete() here to clean up
      *  but there is actually no way (in normal circumstances) that the
@@ -473,8 +474,10 @@ rtems_status_code rtems_timer_initiate_server(
      *  be good.  If this service fails, something is weirdly wrong on the
      *  target such as a stray write in an ISR or incorrect memory layout.
      */
-    initialized = false;
-  }
+    if (status) {
+      initialized = false;
+    }
+  #endif
 
   return status;
 }