Added check not to log too early...