Fixed null bug
Delete controller