FIX - errors and logging standardized things across all helpers