Merge pull request #29 from Gatzy118/nick-new

Nick new
Some error stuff