Fixed track without parameters
Better connection error handling