Capturing command of exit.
Capturing errors generated by the client.
Merge remote-tracking branch 'origin/master'