Get the actual message,
Catch FileNotFound exceptions and give back readable errors
Re-indent file
Merge pull request #1599 from Mnkras/hotfix/file-rescan

Fix Rescan on removed files