Went ahead and inserted a check at a semi-strategic spot, should be enough to prevent this from escaping: 5f0174dc9#diff-c13797cc2e5864c4a1d6a92ba65871b6R762