Proper guard against crash in prod