Improve traffic data error handling
Merge branch 'master' of https://github.com/Trakl2014/trakl