Adding a check in findOne if return value is null.