Fix Marcel's last fix: `kwargs` is undefined in `handle_server_error`