diff --git a/Netdisco/bin/netdisco-do b/Netdisco/bin/netdisco-do
index 1ae955b2..73bba57d 100755
--- a/Netdisco/bin/netdisco-do
+++ b/Netdisco/bin/netdisco-do
@@ -74,7 +74,8 @@ $ENV{DBIC_TRACE} ||= $sqltrace;
 Dancer::Logger->init('console', $CONFIG);
 
 # get requested action
-(my $action = shift @ARGV) =~ s/^set_//;
+(my $action = shift @ARGV) =~ s/^set_//
+  if scalar @ARGV;
 
 unless ($action) {
     pod2usage(