Added error message/indicator logic