Blender Git Loki

Try to remap buffer before rejecting.

I suspect code here can be cleaned up but for now try this.
Alternatively we can check for errors around buffer allocation
but this needs bigger changes.