Changed colors
Checked for null values