fixed copy pasta
Better message handling on save