Fix NPE

Change-Id: I97d16596b53297680f7d6bce22601b3283ad0374