Issue #17 - Always return the File

* Ensure the response from this method is always the same.
* Avoid potential NullPointerExceptions