fix the NPE issue when connection error thrown
Merge branch 'master' of https://github.com/TEDinTW/drink