Fix naming and add log if there is no dispatcher available.

Please review and merge