Few more checks for assets