Check for nil
Fix crash on nil
Fix display