Add beta warning and fix error message