I had the same problem and moved my data directory. Now when I try to move my old wallet.dat file back to the new data directory it says my wallet is corrupt.
Where you able to get everything back as it was before??
Edit:
Nevermind, I fixed it. I had to setup the client for an encrypted wallet.