am 0dfe31ff: am d339bfbc: am a3d755c6: am 55ae5776: Check for null from address

* commit '0dfe31ff4a36dddb3fa696cb5d352c443176c44a':
  Check for null from address