master
Added case for the absence of a function