Once again fix dealing with null.