Remy Maucherat
committed
on 14 Nov 14
Same as r2381, avoid NPE after recycle.