Improved error handling during editing the apartment