Changed the no_create behaviour per Pete's ideas.