Added a check for an invalid specified import directory.
Merge remote-tracking branch 'origin/master'