Added check for null path to bundle