Slightly fixed server error handling
Further work on a client - only actual sending data remains