Check for null better.