Providing better exception handling.
Favoring FilePath wherever possible.