Make rake tasks stashing safer