o [Fix] NullPointerException when source hasn't been pulled before
o [CQ] imporved Logging