Updated patch to remove error message and add a condition to display error me...