DC/Melanie | #3793 #3794 | Improving the guard condition for label not present