avoid null messages being send
fixed url
fixed naming and url