Unify to AppShell and minimalistic defensive good coding practice.
Merge pull request #1276 from dereuromark/3.0-shell

Unify to AppShell and minimalistic defensive good coding practice.