Bug fix: don't return if there is no error