Fixed bug with not destroying service after pressing cancel button