#56 deleted wrong exception and dao cleaned. Unused method deleted.