Remove NPE when listContext is null

Change-Id: Ife330f28c3d34b8e0d028d30c92e857dec86d81f
5 files changed