etl

error-handler: only return when the condition is false

#567

Merged