Added null check to comment activity