* helm-files.el (helm-find-files-get-candidates): Protect file-directory-p when arg is nil.
(helm-c-find-file-or-marked): Same.
* helm-match-plugin.el (helm-mp-highlight-match-internal): Fix error when function run in timer after exit.
Merge branch 'exp'
Merge branch 'exp'