Add "error handling", reorganize definition order for more clarity