Removed the error message and minor changes.