Whoops, clean didn't properly create dir. Also add in more sanity checks.