BUGFIX: Null pointers were not managed