Avoiding quit hanging + better verbose logging