Add better CLI handling of server-side exceptions