Fix null pointer on EOS dump
Remove dumping from load