6 Months Ago
Added null check