Small cleanup.

Check for null before comparing folder, before looking at conv list
context.

Change-Id: I254bda02cb4fdbc2878ff132b82feab13bb05647
2 files changed