Updating the error message and removing the special case for the java backend.