Handle null better.