Tried to add error messages
Merge remote-tracking branch 'origin/qr' into qr