Merge pull request #286 from Masterminds/fix-empty-directory

Fixed #275, #285: Empty package location causes errors