Bug fix: nil should be null.