@umpirsky Joseph is right, please add this little check and we're good to merge.