Merge
Add error messages for input