Rebuild Failed: bootstrap failed with exit code 137

Not a bad idea! Adding a bit more swap seems easier if you can spare the disk space.