I've done some basic testing and it seems to be dealing with it properly, I'll check again after implementing @sathomas' suggestion.