Changed the way display message types are handled

Also improved a little thing with NPE's for channel information.