Fixed previous commit that actually made everything throw errors when it worked fine