diff --git a/bacnet-stack/demo/dcc/main.c b/bacnet-stack/demo/dcc/main.c
index 397bb8d5..7398c345 100644
--- a/bacnet-stack/demo/dcc/main.c
+++ b/bacnet-stack/demo/dcc/main.c
@@ -263,7 +263,10 @@ int main(int argc, char *argv[])
             /* increment timer - exit if timed out */
             elapsed_seconds += (current_seconds - last_seconds);
             if (elapsed_seconds > timeout_seconds)
+            {
+                printf("\rError: APDU Timeout!");
                 break;
+            }
         }
         /* keep track of time for next check */
         last_seconds = current_seconds;
diff --git a/bacnet-stack/demo/readfile/readfile.c b/bacnet-stack/demo/readfile/readfile.c
index f751b4f3..8519f145 100644
--- a/bacnet-stack/demo/readfile/readfile.c
+++ b/bacnet-stack/demo/readfile/readfile.c
@@ -290,7 +290,10 @@ int main(int argc, char *argv[])
             /* increment timer - exit if timed out */
             elapsed_seconds += (current_seconds - last_seconds);
             if (elapsed_seconds > timeout_seconds)
+            {
+                printf("\rError: APDU Timeout!");
                 break;
+            }
         }
         /* keep track of time for next check */
         last_seconds = current_seconds;
diff --git a/bacnet-stack/demo/readprop/readprop.c b/bacnet-stack/demo/readprop/readprop.c
index 9daeac22..589cfa92 100644
--- a/bacnet-stack/demo/readprop/readprop.c
+++ b/bacnet-stack/demo/readprop/readprop.c
@@ -230,7 +230,10 @@ int main(int argc, char *argv[])
             /* increment timer - exit if timed out */
             elapsed_seconds += (current_seconds - last_seconds);
             if (elapsed_seconds > timeout_seconds)
+            {
+                printf("\rError: APDU Timeout!");
                 break;
+            }
         }
         /* keep track of time for next check */
         last_seconds = current_seconds;
diff --git a/bacnet-stack/demo/writefile/makefile.b32 b/bacnet-stack/demo/writefile/makefile.b32
index 9a157594..085a3ab7 100644
--- a/bacnet-stack/demo/writefile/makefile.b32
+++ b/bacnet-stack/demo/writefile/makefile.b32
@@ -25,7 +25,7 @@ SRCS = writefile.c \
        ..\..\demo\handler\h_whois.c  \
        ..\..\demo\handler\h_rp.c  \
        ..\..\demo\handler\s_whois.c  \
-       ..\..\demo\handler\s_awr.c  \
+       ..\..\demo\handler\s_awfs.c  \
        ..\..\bacdcode.c \
        ..\..\bacapp.c \
        ..\..\bacstr.c \
diff --git a/bacnet-stack/demo/writefile/writefile.c b/bacnet-stack/demo/writefile/writefile.c
index f0a820e5..30f6b505 100644
--- a/bacnet-stack/demo/writefile/writefile.c
+++ b/bacnet-stack/demo/writefile/writefile.c
@@ -268,7 +268,10 @@ int main(int argc, char *argv[])
             /* increment timer - exit if timed out */
             elapsed_seconds += (current_seconds - last_seconds);
             if (elapsed_seconds > timeout_seconds)
+            {
+                printf("\rError: APDU Timeout!");
                 break;
+            }
         }
         /* keep track of time for next check */
         last_seconds = current_seconds;
diff --git a/bacnet-stack/demo/writefile/writefile.ide b/bacnet-stack/demo/writefile/writefile.ide
index a6a3468e..df787ac9 100644
Binary files a/bacnet-stack/demo/writefile/writefile.ide and b/bacnet-stack/demo/writefile/writefile.ide differ
diff --git a/bacnet-stack/demo/writeprop/writeprop.c b/bacnet-stack/demo/writeprop/writeprop.c
index 6ac4dbe5..88eceba1 100644
--- a/bacnet-stack/demo/writeprop/writeprop.c
+++ b/bacnet-stack/demo/writeprop/writeprop.c
@@ -327,7 +327,10 @@ int main(int argc, char *argv[])
             /* increment timer - exit if timed out */
             elapsed_seconds += (current_seconds - last_seconds);
             if (elapsed_seconds > timeout_seconds)
+            {
+                printf("\rError: APDU Timeout!");
                 break;
+            }
         }
         /* keep track of time for next check */
         last_seconds = current_seconds;