hopefully completed error handling
hopefully completed error handling