Added @NotFound exception