diff --git a/src/jdwp/jdwp_event.cc b/src/jdwp/jdwp_event.cc
index 841ee8c..891ba53 100644
--- a/src/jdwp/jdwp_event.cc
+++ b/src/jdwp/jdwp_event.cc
@@ -780,7 +780,7 @@
         expandBufAdd1(pReq, match_list[i]->eventKind);
         expandBufAdd4BE(pReq, match_list[i]->requestId);
         expandBufAdd8BE(pReq, basket.threadId);
-        AddLocation(pReq, pLoc);
+        expandBufAddLocation(pReq, *pLoc);
       }
     }
 
@@ -955,10 +955,10 @@
         expandBufAdd4BE(pReq, match_list[i]->requestId);
         expandBufAdd8BE(pReq, basket.threadId);
 
-        AddLocation(pReq, pThrowLoc);
+        expandBufAddLocation(pReq, *pThrowLoc);
         expandBufAdd1(pReq, JT_OBJECT);
         expandBufAdd8BE(pReq, exceptionId);
-        AddLocation(pReq, pCatchLoc);
+        expandBufAddLocation(pReq, *pCatchLoc);
       }
 
       /* don't let the GC discard it */