Do not redirect to empty page (#789)