Adding some additional logging to figure out what is going on and also fixed an issue where no payload just bailed out