remove limit add exception handling