diff --git a/src/NimBLERemoteService.cpp b/src/NimBLERemoteService.cpp
index cd3d528..f0cbed1 100644
--- a/src/NimBLERemoteService.cpp
+++ b/src/NimBLERemoteService.cpp
@@ -256,7 +256,9 @@ bool NimBLERemoteService::retrieveCharacteristics(const NimBLEUUID *uuid_filter)
                 }
             }
 
-            m_characteristicVector.back()->m_endHandle = getEndHandle();
+            if (m_characteristicVector.size() > 0) {
+                m_characteristicVector.back()->m_endHandle = getEndHandle();
+            }
         }
 
         NIMBLE_LOGD(LOG_TAG, "<< retrieveCharacteristics()");