Shouldn't this be || instead of &&? We're not always going to send both, surely?