bvanderveen/null

More code more problems.