Include more data to relay to server
Prevent crash if system dialog fails in any way