fix null pointer when no label has been set
Merge branch 'master' of github.com:ridoo/timeseries-api