The passed-in filter string can no longer be NULL, so use strlen instead of testing...