Tweaked error handling on the client module. Added TODOs to read me,
s