Improve error handling
Test subdirs