Fixed error handling
Updating