Move 304 check a little earlier