Added some error parsing #59