Added comment
Simplified file-searching for error reporting