#46: Remove left over handle_error function calls