Fixed some setters/getters to account for empty/null input.