Added null controller support