Deal with invalid requests a little better