Improve error handling, receive diag messages,