Better handling of incomplete directories.