5 Months Ago
Added null check