Add rethrow to exception
Clean code