File removing handled the same way as scanning
Send exceptions to logger and fixed some errors