changes in exception handling + pagination
merging