Bugfix #5769552212584
New: Checking for Connection at several stages