Improve handling the 'No space left on device' situation