Get past exception point on #334 @subjunk