CHANGED: Improved error handling for beaming groups