[TASK] Replace thrown RuntimeException with log message