diff --git a/base/applications/rapps/include/rosui.h b/base/applications/rapps/include/rosui.h
index 0aaf303b017..4402b26f28b 100644
--- a/base/applications/rapps/include/rosui.h
+++ b/base/applications/rapps/include/rosui.h
@@ -96,9 +96,13 @@ public:
 
     BOOL RemoveAt(INT i)
     {
-        T* ptr = (T*) DPA_GetPtr(m_hDpa, i);
-        OnRemoveItem(ptr);
-        return DPA_DeletePtr(m_hDpa, i);
+        PVOID ptr = DPA_DeletePtr(m_hDpa, i);
+        if (ptr != NULL)
+        {
+            OnRemoveItem(reinterpret_cast<T*>(ptr));
+            return TRUE;
+        }
+        return FALSE;
     }
 
     BOOL Clear()