Updated version number
Added check for null path element