Hendrik Leppkes (2):
      827eca0: Cleanup of global vars and upvalues
      71b027d: Added a check to not break on classes that are not supported

