Merge everything before "ts.gui" changes...

@nealstewart 
Ah. This message should in some way indicate that an invalid selector was passed, rather than just that "computer says no!"