Not quite sure about this change - it might be worth checking the return code and raising a warning if it fails.