Move the application helper into the correct scope
Add handling of collectd and service errors