diff --git a/cmd/npm/npm.go b/cmd/npm/npm.go
index a82cd1c..c4d2689 100644
--- a/cmd/npm/npm.go
+++ b/cmd/npm/npm.go
@@ -3,6 +3,7 @@ package npm
 import (
 	_ "embed"
 
+	"github.com/safedep/dry/log"
 	"github.com/safedep/pmg/config"
 	"github.com/safedep/pmg/internal/ui"
 	"github.com/spf13/cobra"
@@ -21,7 +22,7 @@ func NewNpmCommand() *cobra.Command {
 
 			err = executeNpmFlow(cmd.Context(), config, args)
 			if err != nil {
-				ui.Fatalf("Failed to execute npm flow: %s", err)
+				log.Errorf("Failed to execute npm flow: %s", err)
 			}
 
 			return nil
diff --git a/cmd/npm/pnpm.go b/cmd/npm/pnpm.go
index fdbe9ba..b506c20 100644
--- a/cmd/npm/pnpm.go
+++ b/cmd/npm/pnpm.go
@@ -3,6 +3,7 @@ package npm
 import (
 	_ "embed"
 
+	"github.com/safedep/dry/log"
 	"github.com/safedep/pmg/config"
 	"github.com/safedep/pmg/internal/ui"
 	"github.com/spf13/cobra"
@@ -21,7 +22,7 @@ func NewPnpmCommand() *cobra.Command {
 
 			err = executePnpmFlow(cmd.Context(), config, args)
 			if err != nil {
-				ui.Fatalf("Failed to execute pnpm flow: %s", err)
+				log.Errorf("Failed to execute pnpm flow: %s", err)
 			}
 
 			return nil
diff --git a/packagemanager/npm.go b/packagemanager/npm.go
index 4ca0bd3..ffed095 100644
--- a/packagemanager/npm.go
+++ b/packagemanager/npm.go
@@ -42,11 +42,7 @@ func (npm *npmPackageManager) Name() string {
 }
 
 func (npm *npmPackageManager) ParseCommand(args []string) (*ParsedCommand, error) {
-	if len(args) == 0 {
-		return nil, fmt.Errorf("no command specified")
-	}
-
-	if args[0] == "npm" || args[0] == "pnpm" {
+	if len(args) > 0 && (args[0] == "npm" || args[0] == "pnpm") {
 		args = args[1:]
 	}