Added if-check to not recurse on non-existent preconditions
Merge branch 'highlighting_fix' into develop