Co-authored-by: Matthew Penner <me@matthewp.io>
Avoids crashing the PHP process and avoids a bad runaway N+1 query issue that previously existed.