diff --git a/handler/handler.go b/handler/handler.go
index 0f0c0f3a6bc..78f34920b8e 100644
--- a/handler/handler.go
+++ b/handler/handler.go
@@ -675,7 +675,7 @@ func (h *Handler) Version() error {
 
 	ver, err := drivers.Version(h.u, h.DB())
 	if err != nil {
-		return err
+		ver = fmt.Sprintf("<unknown, error: %v>", err)
 	}
 
 	if ver != "" {
@@ -761,7 +761,7 @@ func (h *Handler) execExec(w io.Writer, prefix, qstr string, qtyp bool, _ string
 	}
 
 	// execRows
-	h.execRows(w, q)
+	err = h.execRows(w, q)
 	if err != nil {
 		return err
 	}