Allow nil holders

Cleaning up