Commented out the NPE-ing methods.