New Exception and JavaDoc adjustments