Added extra checks for ext storage class

Backport of #7305
Merge pull request #7365 from owncloud/backport-7305

Added extra checks for ext storage class (Backport to stable5)