Reviewed-by: dholmes, trebari, jdv
Fixed corner case of having engineName as NULL Reviewed-by: jlaskey