tree e51048c7a83947a941e166e4b9acafb31f903043
parent ed88ff683ee8aaa13ed5d45ff1e927ed7d4ddb71
author Ray Milkey <ray@onlab.us> 1472578739 -0700
committer Gerrit Code Review <gerrit@onlab.us> 1472582374 +0000

Recover from NPE that can sometimes be thrown by Felix

Change-Id: Ib9415df4708dc1265edfdaf4168bd29eb0805614