handle None parameters in query, returning NULL
#1180
Merged
None parameters in query, returning NULL
#1180