diff --git a/Makefile b/Makefile
index 4203167..cdb5b2c 100644
--- a/Makefile
+++ b/Makefile
@@ -24,8 +24,12 @@ client: mod ## Runs the uncompiled example client code
            --components-path example/client/comp \
            go run example/client/main.go 
 
-lint: ## Lints the entire project 
-	golangci-lint run --timeout=3m
+lint: ## Lints the entire project using GitHub super-linter
+	docker run -e RUN_LOCAL=true \
+	           -e VALIDATE_ALL_CODEBASE=false \
+						 -e VALIDATE_GO=true \
+						 -v $(PWD):/tmp/lint admiralawkbar/super-linter
+	# golangci-lint run --timeout=3m
 
 tag: ## Creates release tag 
 	git tag $(RELEASE_VERSION)
diff --git a/client/client_test.go b/client/client_test.go
index 0229d1d..e812cae 100644
--- a/client/client_test.go
+++ b/client/client_test.go
@@ -42,7 +42,7 @@ func getTestClient(ctx context.Context) (client *Client, closer func()) {
 	pb.RegisterDaprServer(s, server)
 	go func() {
 		if err := s.Serve(l); err != nil {
-			panic(err)
+			logger.Fatalf("error starting test server: %s", err)
 		}
 	}()