Fix album saving error logic

and remove stopwatch code