Bug fix
update CHANGES
update version
Added additional error handling
more robust error handling