Fix potential leak and null pointer dereference
Merge branch 'master' of github.com:baskerville/bspwm