Check return value of isfile; narrow exception def

Feedback was correct, the isfile was not being checked. I have some
work done on an AndroidTarget test class, hopefully I will get that
done this week.