Added correct null parsing back