Better error handling
Added link
Fixed tests