More error handling at send