Issue 11 : Better server response handling