Adds Null check and make it work with h01.rtrsupport.de