Fixed problem with NULL and FALSE arguments