diff --git a/fsw/src/to_lab_app.c b/fsw/src/to_lab_app.c
index 2daa4da..910b6a4 100644
--- a/fsw/src/to_lab_app.c
+++ b/fsw/src/to_lab_app.c
@@ -53,7 +53,10 @@ void TO_LAB_AppMain(void)
 
     if (status != CFE_SUCCESS)
     {
-        return;
+        /*
+        ** Set request to terminate main loop...
+        */
+        RunStatus = CFE_ES_RunStatus_APP_ERROR;
     }
 
     /*
@@ -105,6 +108,9 @@ CFE_Status_t TO_LAB_init(void)
     void *        TblPtr;
     TO_LAB_Sub_t *SubEntry;
 
+    /* Zero out the global data structure */
+    memset(&TO_LAB_Global, 0, sizeof(TO_LAB_Global));
+
     TO_LAB_Global.downlink_on = false;
     PipeDepth                 = TO_LAB_CMD_PIPE_DEPTH;
     strcpy(PipeName, "TO_LAB_CMD_PIPE");