Make the getter return the object instead of primitive.

NPE prevention, also included a comment by way of explanation.