Add further error checking
update changelog