The double line works for the second ending but not the first.
If I take out the previous bar line it looks normal but then there is no bar line in the previous bar

Click image for larger version. 

Name:	Screen Shot 2015-10-01 at 6.51.12 PM.png 
Views:	841 
Size:	31.7 KB 
ID:	368Click image for larger version. 

Name:	Screen Shot 2015-10-01 at 6.50.45 PM.png 
Views:	303 
Size:	32.1 KB 
ID:	369