added null check
Merge branch 'development' of https://github.com/Mauricevb/42IN07SOb into development