verification

some small changes in classes. without throw exception