fixes + support for NotFound error