Improve error handling, add logging