Replaced hard-coded strings in bus & added null arg checks to display