am d8f6253e: Merge "When ensuring screen exists, make sure it\'s actually referring to a screen, not a rank" into ub-now-porkchop

* commit 'd8f6253e67d23dcdcf521b0558f193ae832743b2':
  When ensuring screen exists, make sure it's actually referring to a screen, not a rank