Fix issue #38 and add warnings on partial save

Fix issue #34