Changed a condition in order to not show `None` if there is not error