am b2ac1ab4: Fix main space memory leak and add checks.

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