fix 2 failure cases
handle server being down