FIXED: null number received.
FIXED: incorrect check