diff --git a/bacnet-stack/demo/handler/h_rpm.c b/bacnet-stack/demo/handler/h_rpm.c
index ae2172d2..6954ff7e 100644
--- a/bacnet-stack/demo/handler/h_rpm.c
+++ b/bacnet-stack/demo/handler/h_rpm.c
@@ -135,7 +135,8 @@ static int RPM_Encode_Property(
     len = Device_Read_Property(&rpdata);
     if (len < 0) {
         if ((len == BACNET_STATUS_ABORT) || (len == BACNET_STATUS_REJECT)) {
-            /* pass on aborts and rejects for now */
+            rpmdata->error_code = rpdata.error_code;
+            /* pass along aborts and rejects for now */
             return len; /* Ie, Abort */
         }
         /* error was returned - encode that for the response */