removes redundant exceptions + fix wrong logic in search function in Storage