better error handling and reporting
Merge branch 'master' into urf-sensor