tree 79b0903e793ccf586c8816134e5b77c5d8481ac0
parent f80bbb22c278310c39f4c56b2714afa6a707063d
author Saurav Das <sauravdas@alumni.stanford.edu> 1459216818 -0700
committer Gerrit Code Review <gerrit@onlab.us> 1459289681 +0000

Fixing a couple of NPEs

Change-Id: I19b5a2787b26e67e05640f6c64a13b58f2dc089a