Add error messages and proper save handling