Added null and undefined controllers