Adding safety in enabled check, and adding explicit catch for pre-existing targets.