Get past exception point on #334 @subjunk

This needs to be looked into further. I do not know if this change will fix or not 100%, please see the issue #334 for more information.