Do not show error stack in the UI
Guard against null error
Do not set the storage value to null
Fix minor bug with builder