Added nonEmpty-String and -Json checks
Switched from manual checks to using isNonEmpty-