Fix some glichtes with the switch on conveyor 1
Also added a todo for an wrong handled error case...