Merge
Added error messages