adjust to allow error retorn json without interferance
merge