Improves descriptive function naming and error message

Related to #19