Merge pull request #1615 from litghost/add_disk_space_checks

Add some disk space checks in happy and sad paths.