diff --git a/src/dbStatic/dbStaticLib.c b/src/dbStatic/dbStaticLib.c
index ea630795f..c89a08a05 100644
--- a/src/dbStatic/dbStaticLib.c
+++ b/src/dbStatic/dbStaticLib.c
@@ -2633,7 +2633,7 @@ long epicsShareAPI dbPutInfoPointer(DBENTRY *pdbentry, void *pointer)
     return (0);
 }
 
-const char * epicsShareAPI dbGetInfoPointer(DBENTRY *pdbentry)
+void * epicsShareAPI dbGetInfoPointer(DBENTRY *pdbentry)
 {
     dbInfoNode *pinfo = pdbentry->pinfonode;
     if (!pinfo) return (NULL);
@@ -2642,8 +2642,8 @@ const char * epicsShareAPI dbGetInfoPointer(DBENTRY *pdbentry)
 
 const char * epicsShareAPI dbGetInfo(DBENTRY *pdbentry,const char *name)
 {
-    dbFindInfo(pdbentry, name);
-    return (dbGetInfoString(pdbentry));
+    if (dbFindInfo(pdbentry, name)) return NULL;
+    return dbGetInfoString(pdbentry);
 }
 
 long epicsShareAPI dbPutInfo(DBENTRY *pdbentry,const char *name,const char *string)
diff --git a/src/dbStatic/dbStaticLib.h b/src/dbStatic/dbStaticLib.h
index 1a753774c..ac9219ffb 100644
--- a/src/dbStatic/dbStaticLib.h
+++ b/src/dbStatic/dbStaticLib.h
@@ -166,7 +166,7 @@ epicsShareFunc long epicsShareAPI dbPutInfoString(
     DBENTRY *pdbentry,const char *string);
 epicsShareFunc long epicsShareAPI dbPutInfoPointer(
     DBENTRY *pdbentry, void *pointer);
-epicsShareFunc const char * epicsShareAPI dbGetInfoPointer(DBENTRY *pdbentry);
+epicsShareFunc void * epicsShareAPI dbGetInfoPointer(DBENTRY *pdbentry);
 epicsShareFunc const char * epicsShareAPI dbGetInfo(
     DBENTRY *pdbentry,const char *name);
 epicsShareFunc long epicsShareAPI dbPutInfo(