Fixed headers and added exception handling in Client :)