From f79998a9b1592b8872e3bead9b8d59918274bb1a Mon Sep 17 00:00:00 2001
From: Michal Fojtik <mfojtik@redhat.com>
Date: Mon, 23 May 2016 16:41:31 +0200
Subject: [PATCH] Fix panic when the namespace flag is not present

---
 pkg/kubectl/cmd/cmd.go | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkg/kubectl/cmd/cmd.go b/pkg/kubectl/cmd/cmd.go
index c0687779e20..19d252945d0 100644
--- a/pkg/kubectl/cmd/cmd.go
+++ b/pkg/kubectl/cmd/cmd.go
@@ -235,13 +235,15 @@ Find more information at https://github.com/kubernetes/kubernetes.`,
 	cmds.AddCommand(NewCmdExplain(f, out))
 	cmds.AddCommand(NewCmdConvert(f, out))
 
-	if cmds.Flag("namespace").Annotations == nil {
-		cmds.Flag("namespace").Annotations = map[string][]string{}
+	if cmds.Flag("namespace") != nil {
+		if cmds.Flag("namespace").Annotations == nil {
+			cmds.Flag("namespace").Annotations = map[string][]string{}
+		}
+		cmds.Flag("namespace").Annotations[cobra.BashCompCustom] = append(
+			cmds.Flag("namespace").Annotations[cobra.BashCompCustom],
+			"__kubectl_get_namespaces",
+		)
 	}
-	cmds.Flag("namespace").Annotations[cobra.BashCompCustom] = append(
-		cmds.Flag("namespace").Annotations[cobra.BashCompCustom],
-		"__kubectl_get_namespaces",
-	)
 
 	return cmds
 }