Bug 1091501 - Error/offline screens loaded when it is needed
Merge pull request #276 from crdlc/bug-1091501

Bug 1091501 - Error/offline screens loaded when it is needed