diff --git a/runtime/hsa-runtime/libamdhsacode/amd_hsa_code.cpp b/runtime/hsa-runtime/libamdhsacode/amd_hsa_code.cpp
index 9e49ba9d53..f6eb92d241 100644
--- a/runtime/hsa-runtime/libamdhsacode/amd_hsa_code.cpp
+++ b/runtime/hsa-runtime/libamdhsacode/amd_hsa_code.cpp
@@ -122,7 +122,9 @@ namespace code {
 
     hsa_status_t Symbol::GetInfo(hsa_code_symbol_info_t attribute, void *value)
     {
-      assert(value);
+      if (!value) {
+          return HSA_STATUS_ERROR_INVALID_ARGUMENT;
+      }
 
       switch (attribute) {
         case HSA_CODE_SYMBOL_INFO_TYPE: {
@@ -145,9 +147,6 @@ namespace code {
         }
         case HSA_CODE_SYMBOL_INFO_MODULE_NAME: {
           std::string ModuleName = GetModuleName();
-          if (!value) {
-              return HSA_STATUS_ERROR_INVALID_ARGUMENT;
-          }
           memset(value, 0x0, ModuleName.size());
           memcpy(value, ModuleName.c_str(), ModuleName.size());
           break;