WIP for call-hooks error handling