* [ISSUE #9135] Remove redundant nullcheck code. * [ISSUE #9135] Refactor method to not always return the same value.