test
Fixed error handling