1 files changed, 6 insertions, 2 deletions
diff --git a/bar/bar.go b/bar/bar.go
index b309671..43122d2 100644
--- a/bar/bar.go
+++ b/bar/bar.go
@@ -162,7 +162,9 @@ func (b *bar) draw() {
 }
 
 func (b *bar) destroy() {
-	b.Mon.TopPadding(0)
+	if (b.Mon != nil) {
+		b.Mon.TopPadding(0)
+	}
 	xproto.DestroyWindow(b.X, b.w)
 }
 
@@ -274,7 +276,9 @@ func init() {
 			case state = <- Handle.NewState:
 				for _, b := range bars {
 					b.Mon = state.GetMon(b.Mon.ID)
-					go b.draw()
+					if b.Mon != nil {
+						go b.draw()
+					}
 				}
 			case <- stoploop:
 				return