Fixed service selection bug and made Null object refactoring.