Fixed typing issue and added 404 response capturing

Apply the patch (and any previous unpatched patches from other releases) with git apply patch2.diff