chaning text, fixing error handling