added error message for invalid entry
merge