Moved a few checks to prevent needless RPC calls. For task: https://app.asana.com/0/18791666670950/20023109289864