Avoid NPE when Annotated Commands are improperly annotated