Better error handling for case where SureFile store has not been set for a given service.
Removed some unnecessary variables.