Check for null
Add bucket prefix