BUGFIX: Bug #2

Added empty pod check