Remove commented out component
Fix the exception message to be more accurate
Verify target_entity is part of the target_graph