storage archive: improve robustness / fix issues
storage archive: improve robustness / fix issues

tscholl2/smc,DrXyzzy/smc,tscholl2/smc,DrXyzzy/smc,sagemathinc/smc,DrXyzzy/smc,tscholl2/smc,tscholl2/smc,sagemathinc/smc,tscholl2/smc,DrXyzzy/smc,sagemathinc/smc,sagemathinc/smc