Made header param uptional and don't crash on param issues