diff --git a/src/catools/caget.c b/src/catools/caget.c
index a2b0e08b0..00056709e 100644
--- a/src/catools/caget.c
+++ b/src/catools/caget.c
@@ -541,11 +541,11 @@ int main (int argc, char *argv[])
     for (n = 0; optind < argc; n++, optind++)
         pvs[n].name = argv[optind] ;       /* Copy PV names from command line */
 
-    connect_pvs(pvs, nPvs);
+    result = connect_pvs(pvs, nPvs);
 
                                 /* Read and print data */
-
-    result = caget(pvs, nPvs, request, format, type, count);
+    if (!result)
+        result = caget(pvs, nPvs, request, format, type, count);
 
                                 /* Shut down Channel Access */
     ca_context_destroy();
diff --git a/src/catools/cainfo.c b/src/catools/cainfo.c
index 924c34b10..ad580f473 100644
--- a/src/catools/cainfo.c
+++ b/src/catools/cainfo.c
@@ -211,10 +211,11 @@ int main (int argc, char *argv[])
     for (n = 0; optind < argc; n++, optind++)
         pvs[n].name = argv[optind] ;       /* Copy PV names from command line */
 
-    connect_pvs(pvs, nPvs);
+    result = connect_pvs(pvs, nPvs);
 
                                 /* Print data */
-    result = cainfo(pvs, nPvs);
+    if (!result)
+        result = cainfo(pvs, nPvs);
 
                                 /* Shut down Channel Access */
     ca_context_destroy();