handle NotFound properly