Fix another possible memory leak

Change-Id: Iee241f94517e8c368bb9465a7c4c685227d39843