klondike - dont try to flush if not initialised
Merge remote-tracking branch 'conman/master'