diff --git a/bacnet-stack/demo/readfile/main.c b/bacnet-stack/demo/readfile/main.c
index efe1d19e..21f4e684 100644
--- a/bacnet-stack/demo/readfile/main.c
+++ b/bacnet-stack/demo/readfile/main.c
@@ -307,6 +307,7 @@ int main(
                 fprintf(stderr, "\rError: TSM Timeout!\r\n");
                 tsm_free_invoke_id(invoke_id);
                 /* try again or abort? */
+                Error_Detected = true;
                 break;
             }
         } else {
@@ -314,6 +315,7 @@ int main(
             elapsed_seconds += (current_seconds - last_seconds);
             if (elapsed_seconds > timeout_seconds) {
                 fprintf(stderr, "\rError: APDU Timeout!\r\n");
+                Error_Detected = true;
                 break;
             }
         }
diff --git a/bacnet-stack/demo/reinit/main.c b/bacnet-stack/demo/reinit/main.c
index 88c66e8b..a5c13a3b 100644
--- a/bacnet-stack/demo/reinit/main.c
+++ b/bacnet-stack/demo/reinit/main.c
@@ -223,6 +223,7 @@ int main(
                 fprintf(stderr, "\rError: TSM Timeout!\r\n");
                 tsm_free_invoke_id(invoke_id);
                 /* try again or abort? */
+                Error_Detected = true;
                 break;
             }
         } else {
@@ -230,6 +231,7 @@ int main(
             elapsed_seconds += (current_seconds - last_seconds);
             if (elapsed_seconds > timeout_seconds) {
                 fprintf(stderr, "\rError: APDU Timeout!\r\n");
+                Error_Detected = true;
                 break;
             }
         }
@@ -237,5 +239,7 @@ int main(
         last_seconds = current_seconds;
     }
 
+    if (Error_Detected)
+        return 1;
     return 0;
 }
diff --git a/bacnet-stack/demo/writefile/main.c b/bacnet-stack/demo/writefile/main.c
index c2e638ea..9e6c49e8 100644
--- a/bacnet-stack/demo/writefile/main.c
+++ b/bacnet-stack/demo/writefile/main.c
@@ -282,6 +282,7 @@ int main(
             } else if (tsm_invoke_id_failed(invoke_id)) {
                 fprintf(stderr, "\rError: TSM Timeout!\r\n");
                 tsm_free_invoke_id(invoke_id);
+                Error_Detected = true;
                 /* try again or abort? */
                 break;
             }
@@ -290,6 +291,7 @@ int main(
             elapsed_seconds += (current_seconds - last_seconds);
             if (elapsed_seconds > timeout_seconds) {
                 fprintf(stderr, "\rError: APDU Timeout!\r\n");
+                Error_Detected = true;
                 break;
             }
         }