Better routing when header is missing (fixes #120)