6 Years Ago
Fix null pointer check