Added null check to compiler tools