Make .queue fail gracefully and use startswith