diff --git a/lib/sass/script/lexer.rb b/lib/sass/script/lexer.rb
index 737466d5..6fca904a 100644
--- a/lib/sass/script/lexer.rb
+++ b/lib/sass/script/lexer.rb
@@ -43,14 +43,13 @@ module Sass
       end
 
       def token
-        return if done?
-
         if @tok
           @tok, tok = nil, @tok
           return tok
         end
 
-        whitespace
+        return if done?
+
         variable || string || number || color || bool || op || ident ||
           (raise SyntaxError.new("Syntax error in '#{@scanner.string}' at '#{@scanner.rest}'."))
       end