Added labels with error detection