Improve error checking and workflow of the Alexandria giving