[TASK] Avoid adding empty sheets to containers

Probably not the most elegant solution but fixes #260.