**DO NOT MERGE#135 (Fixed) and #136 **Incomplete** StackOverflowError on calling ESHandler.update() 

Do not merge this, it is going to be put up so someone else can see if they know why the code i added is causing a segfault on something that works otherwise (ESHandler.update)