Fixed the handleing of 404 not found err