Solution for Issue #1, plus file not found handling