Fix for error message display and join