Revert the change and fix the null pointer problem in business logic.