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

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