Feature/bugfix connection did fail