Refactor handlers for better readability

**Problem**
When working with hooks, the error messages could be more descriptive.

**Suggestion**
Improve error handling and add detailed error messages.

**Context**
This would help with debugging and maintenance.

Start by locating the handlers and hooks responsible for the current error messages, then read the surrounding error-handling flow. Done means the relevant errors provide more descriptive messages and the existing behavior remains intact, but the issue does not name specific files or tests to run.

Written by the indexing model from the issue text.