Merge "Modified not to occur NPE when handle call of failed connection"