Added error message
Merge pg and master