Fix weird exception with has data to save