98a99,106
> 
>         /*
>          * JP, 25-May-03: Swapped checking for underlying figure and
>          * existing connection. If figure is checked first (old version),
>          * it is not possible to insert new points into a connection that
>          * crosses or otherwise goes through an existing figure. New
>          * version checks for connection first.
>          */
99,108d116
< 		setTargetFigure(findConnectionStart(ex, ey, drawing()));
< 		if (getTargetFigure() != null) {
< 			setStartConnector(findConnector(ex, ey, getTargetFigure()));
< 			if (getStartConnector() != null) {
< 				setConnection(createConnection());
< 				getConnection().startPoint(ex, ey);
< 				getConnection().endPoint(ex, ey);
< 				setAddedFigure(view().add(getConnection()));
< 			}
< 		}
109,109c117,117
< 		else {
---
> 		else {
109a118,127
> 			setTargetFigure(findConnectionStart(ex, ey, drawing()));
> 			if (getTargetFigure() != null) {
> 				setStartConnector(findConnector(ex, ey, getTargetFigure()));
> 				if (getStartConnector() != null) {
> 					setConnection(createConnection());
> 					getConnection().startPoint(ex, ey);
> 					getConnection().endPoint(ex, ey);
> 					setAddedFigure(view().add(getConnection()));
> 				}
> 			}
110,111d117
< 			// Since we can't connect to the figure, see if its a Connection
< 			// object we can modify the appearance of.