Use return to avoid being exited from a no X session (no display) when logging
Simplify comment