added better errors
merging