reworded error messages and renamed unlocked to stats
Merge remote-tracking branch 'origin/master'