no method + on nil due to the local var not set
Merge pull request #78 from opscode/jtimberman/fix-ebs-cleanup

no method + on nil due to the local var not set