Add check if headers is not None before treating it like a dict

Add check if headers is not None before treating it like a dict #1529