Fix segfault when 'not enough space'

(cherry picked from commit 0eec52b1)