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

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