Adding NA values
Getting rid of warning raised because is.na was called on NULL
Another fix attempt. Checking to see if expression is a list
Merge branch 'bug-fixes' into auto-annotations