Minor refactor and prevention of possible system panic
Minor refactor and prevention of possible system panic

NobbZ/redox,tedsta/redox,LazyOxen/redox,tedsta/redox,nounoursheureux/redox,nounoursheureux/redox,achanda/redox,fischmax/redox,stryan/redox,tedsta/redox,achanda/redox,stryan/redox,nounoursheureux/redox,LazyOxen/redox,nxnfufunezn/redox,bheesham/redox,imp/redox,vvlevchenko/redox,achanda/redox,LazyOxen/redox,skylerberg/redox,imp/redox,tedsta/redox,vvlevchenko/redox,NobbZ/redox,imp/redox,LazyOxen/redox,stryan/redox,nxnfufunezn/redox,fischmax/redox,bheesham/redox,skylerberg/redox,fischmax/redox,skylerberg/redox,NobbZ/redox,stryan/redox,bheesham/redox,vvlevchenko/redox,nxnfufunezn/redox,fischmax/redox,bheesham/redox,skylerberg/redox,NobbZ/redox