add check for valid screen; fixes test
(cherry picked from commit 98b05633b6a72846bfa561652ef3fe8922d93a01)