MR Client is working, but still needs more error handling