Error function completed
Merge branch 'error_func'