PrepareClose should probably return bool

Change-Id: Ie62a6c1197594102bc68e246ae6059a9442ce314