Empty container handling

Empty container handling

Empty container handling