fixed NPEs in Assert
2 files changed