check for correct arguments to fix null/promise filtering fixes #2