Adding proper errors for callbacks based on PR feedback