Check for a current screen before checking the current screen
Merge pull request #222 from washingtonstateuniversity/bug-clear-site-request

[PR] Check for a current screen before checking the current screen