Fix exception when no comment
Saving in time