update changelog fix error handling