Merge "Avoid NullPointerException"
Jeff Sharkey [Thu, 2 May 2013 16:53:27 +0000 (16:53 +0000)]

Trivial merge