Fix EMPTY mode validation, hook null-checks, and Javadoc accuracy

Fix EMPTY mode validation, hook null-checks, and Javadoc accuracy #383