fix message
better error handling