Alot of changes, deleted 2. case, added thwor new Exception, where it was possible
This is the latest