Added error string
Merged