Improved error handling and added Insurance attribute
Updated version