fix hubiquitus gateway time out issue
set transport to null on Error
Add comments
Fix some comments