Fix NotEnoughFreeSpace error being fired sometimes