Added error message fix