Issue #511 - Fixing the bug
Merge pull request #513 from ndomar/bugfix_#511

Bug : Fixing No content app crash