Some fixes to assisted targeting

Was not checking for nil values, an initial test with everything using
default values seems to work now