Add couple nil checks
Add couple nil checks


thibmo/kam_remake,reyandme/kam_remake,thibmo/kam_remake,thibmo/kam_remake,reyandme/kam_remake,thibmo/kam_remake,thibmo/kam_remake,reyandme/kam_remake,reyandme/kam_remake,reyandme/kam_remake