Tweaks to eagerness patch & catch file not found exceptions