check labeling handler + clean up

+ clean up error handling