[BUGFIX] Removed @throws InvaildSubjectException as it gets never thrown