Merge pull request #6261 from onflow/ramtin/evm-patch-the-nil-reference

Merge pull request #6261 from onflow/ramtin/evm-patch-the-nil-reference #2684