Improved error handling
Documentation update