am 9c81c0cb: Merge "Fix main space memory leak and add checks."

* commit '9c81c0cb0dc8c8d8ae5dca3d2d82b0eec7af589f':
  Fix main space memory leak and add checks.