diff --git a/integrations/promunifi/unifipoller/config.go b/integrations/promunifi/unifipoller/config.go
index 8f2596d6..9c66df55 100644
--- a/integrations/promunifi/unifipoller/config.go
+++ b/integrations/promunifi/unifipoller/config.go
@@ -33,7 +33,6 @@ type UnifiPoller struct {
 	ConfigFile string
 	DumpJSON   string
 	ShowVer    bool
-	Lambda     bool
 	Flag       *pflag.FlagSet
 	errorCount int
 	influx.Client
diff --git a/integrations/promunifi/unifipoller/unifipoller.go b/integrations/promunifi/unifipoller/unifipoller.go
index ad8716b9..ff1fe0f1 100644
--- a/integrations/promunifi/unifipoller/unifipoller.go
+++ b/integrations/promunifi/unifipoller/unifipoller.go
@@ -22,7 +22,10 @@ import (
 func Start() error {
 	log.SetFlags(log.LstdFlags)
 	up := &UnifiPoller{}
-	if up.ParseFlags(os.Args[1:]); up.ShowVer {
+	if os.Args != nil && len(os.Args) > 1 {
+		up.ParseFlags(os.Args[1:])
+	}
+	if up.ShowVer {
 		fmt.Printf("unifi-poller v%s\n", Version)
 		return nil // don't run anything else w/ version request.
 	}
@@ -95,6 +98,7 @@ func (u *UnifiPoller) Run() (err error) {
 	}
 	switch {
 	case u.Lambda:
+		u.LogDebugf("Lambda Mode Enabled")
 		return u.CollectAndReport()
 	default:
 		return u.PollController()