Only check ENV['ROLES'] for @plan if @plan

:scream_cat: So I guess I should pay attention to my own tests. It pointed out a flaw in my earlier fix. 
gotta check @plan isn't nil before we look in the ENV['ROLES'].