am 64f6b529: Merge "Avoid NullPointerException"
Jeff Sharkey [Thu, 2 May 2013 17:53:18 +0000 (10:53 -0700)]
* commit '64f6b529963d1ec997cff60a79c9d249e5e09040':
  Avoid NullPointerException


Trivial merge