Try to prevent faulty history savings

This is still not 100% correct (also ugly). Investigate later, not a
priority.
Remove handling of faulty hist in history service