Fixed improper handling of NULLs when passed in arguments