Don't crash when the connection is not established
Don't crash when the connection is null
Replace old app icon