Merge pull request #8 from iru-/master

Do not try to access entries when no layout has been applied. Add tests ...