Added eroor message to toString method.
Merge remote-tracking branch 'origin/master'