messages now properly terminate, error handling