Error Text and handling fixed