fixed null pointer
rename service
Merge branch 'frontend' of https://github.com/BarnBay/master into frontend