Fixes NPE and simplifies missed calls handling.