Updates to error message & selector