No more segfaults

This fixes the segfault and showing the empty container issues.