Merge "Fix a crash during mock testing"