diff --git a/rmw_implementation/src/functions.cpp b/rmw_implementation/src/functions.cpp
index 3a6d5354..8be580df 100644
--- a/rmw_implementation/src/functions.cpp
+++ b/rmw_implementation/src/functions.cpp
@@ -535,7 +535,7 @@ RMW_INTERFACE_FN(rmw_set_log_severity,
   1, ARG_TYPES(rmw_log_severity_t))
 
 RMW_INTERFACE_FN(rmw_get_publishers_info_by_topic,
-  rmw_ret_t, RMW_RET_UNSUPPORTED,
+  rmw_ret_t, RMW_RET_ERROR,
   5, ARG_TYPES(
     const rmw_node_t *,
     rcutils_allocator_t *,
@@ -544,7 +544,7 @@ RMW_INTERFACE_FN(rmw_get_publishers_info_by_topic,
     rmw_topic_info_array_t *))
 
 RMW_INTERFACE_FN(rmw_get_subscriptions_info_by_topic,
-  rmw_ret_t, RMW_RET_UNSUPPORTED,
+  rmw_ret_t, RMW_RET_ERROR,
   5, ARG_TYPES(
     const rmw_node_t *,
     rcutils_allocator_t *,
@@ -626,9 +626,7 @@ void prefetch_symbols(void)
   GET_SYMBOL(rmw_service_server_is_available)
   GET_SYMBOL(rmw_set_log_severity)
   GET_SYMBOL(rmw_get_publishers_info_by_topic)
-  rmw_reset_error();
   GET_SYMBOL(rmw_get_subscriptions_info_by_topic)
-  rmw_reset_error();
 }
 
 void * symbol_rmw_init = nullptr;