Cleaner null handling
Pad border