- Fix Error handling