Memory leak and NULL dereference fixes. PR#3403 (Imported from upstream's e42c208235a86beee16ff0d0e6ca4e164a57d21a) Change-Id: Ibcdd8c95604f661055bfb1e91b15fd3686a04c0d