*** Avoid NPE
refs #468 - delicate refactoring to avoid multiple screen entities
creation during a single action. Also re-factored mockup session
accordingly