Added serial error break
Fixed merge