diff --git a/cmd/client/main.go b/cmd/client/main.go
index 8e058885..74445d46 100644
--- a/cmd/client/main.go
+++ b/cmd/client/main.go
@@ -1,6 +1,7 @@
 package main
 
 import (
+	"fmt"
 	"log"
 	"os"
 
@@ -45,7 +46,7 @@ var runtimeVersionCommand = cli.Command{
 		// Set up a connection to the server.
 		conn, err := grpc.Dial(address, grpc.WithInsecure())
 		if err != nil {
-			log.Fatalf("Failed to connect: %v", err)
+			return fmt.Errorf("Failed to connect: %v", err)
 		}
 		defer conn.Close()
 		client := pb.NewRuntimeServiceClient(conn)
@@ -54,9 +55,8 @@ var runtimeVersionCommand = cli.Command{
 		version := "v1alpha1"
 		err = Version(client, version)
 		if err != nil {
-			log.Fatalf("Getting the runtime version failed: %v", err)
+			return fmt.Errorf("Getting the runtime version failed: %v", err)
 		}
-
 		return nil
 	},
 }
diff --git a/server/server.go b/server/server.go
index f62e4177..394e1a73 100644
--- a/server/server.go
+++ b/server/server.go
@@ -17,14 +17,14 @@ func (s *Server) Version(ctx context.Context, req *pb.VersionRequest) (*pb.Versi
 
 	version, err := getGPRCVersion()
 	if err != nil {
-		return nil, nil
+		return nil, err
 	}
 
 	runtimeName := "runc"
 
 	runtimeVersion, err := execRuncVersion("runc", "-v")
 	if err != nil {
-		return nil, nil
+		return nil, err
 	}
 
 	runtimeApiVersion := "v1alpha1"