Modified if -> unless nil?