Improved error handling on client accept