am 554d902e: Merge "Memory leak and NULL pointer check fixes"

* commit '554d902e4bcd06cb6847a2b960b4b074ed863931':
  Memory leak and NULL pointer check fixes