fixed Storing, added exceptions