Fix group
Add image
Improve error handling