How can I stop newly arrived NPCs from falling into my lava moat?

I've constructed a lava moat to help defend my house after entering Hardmode.

Unfortunately it seems like NPCs that are spawning and falling into the moat. I'm getting messages like:

Jake the Guide has arrived!
Jake the Guide was slain!

How can I stop them from committing suicide in my moat?