Fixes to NPE errors when searching directories recursively