Fix JSON analyz and exceptions