fix: remove redirection and throw error

[swarmHaseeb]

Checklist

• [x] I have read the coding guide
• [ ] My change requires a documentation update and I have done it
• [x] I have added tests to cover my changes.
• [x] I have filled out the description and linked the related issues

Description

Remove redirection and throw error when resource is not found

Motivation and context (Optional)

Api refactoring

Related Issue (Optional)

fixes #3199

Screenshots (if appropriate):

---

This change is