Edge case handling

@mupuf ,I quickly threw together these patches to get feedback as to whether these would be useful to mitigate issues seen with enabling the recent replication script. I didn't want to spend time writing tests until I knew if these would be worth adding or not.

So if you think it's a good idea, I'll get those written