Return value fix

All calls should return false if the user clicks on cancel.