Revert "Revert "Error so roolback""

This reverts commit 541916c29b70b820f5f620abec63067cf51116b3.