Cleanup on error feedback

@jancborchardt please review