Added check and return null in case service reference was not found
Merge branch 'master' of git@github.com:Dexels/navajo.git