Added extra check.
Undid changes to Rakefile.