rename handler, early return if block is missing, log.debug replaces log.info