buffer is nil sometimes, just ignore

We end up with nil buffers sometimes, this is admittedly a hack, does it fix #344 and #345?