Make if not exists

Change-Id: I741be7da51942452cd522a445ff57fc8886a562c