better error handling
updated
cleanujp
updated