diff --git a/module/CLI/src/Command/Visit/UpdateDbCommand.php b/module/CLI/src/Command/Visit/UpdateDbCommand.php
index 938c24b7..0e1cc223 100644
--- a/module/CLI/src/Command/Visit/UpdateDbCommand.php
+++ b/module/CLI/src/Command/Visit/UpdateDbCommand.php
@@ -4,7 +4,7 @@ declare(strict_types=1);
 namespace Shlinkio\Shlink\CLI\Command\Visit;
 
 use Shlinkio\Shlink\CLI\Util\ExitCodes;
-use Shlinkio\Shlink\Common\Exception\RuntimeException;
+use Shlinkio\Shlink\IpGeolocation\Exception\RuntimeException;
 use Shlinkio\Shlink\IpGeolocation\GeoLite2\DbUpdaterInterface;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Helper\ProgressBar;
diff --git a/module/CLI/src/Util/GeolocationDbUpdater.php b/module/CLI/src/Util/GeolocationDbUpdater.php
index 48f958ca..1a2c5715 100644
--- a/module/CLI/src/Util/GeolocationDbUpdater.php
+++ b/module/CLI/src/Util/GeolocationDbUpdater.php
@@ -6,7 +6,7 @@ namespace Shlinkio\Shlink\CLI\Util;
 use Cake\Chronos\Chronos;
 use GeoIp2\Database\Reader;
 use Shlinkio\Shlink\CLI\Exception\GeolocationDbUpdateFailedException;
-use Shlinkio\Shlink\Common\Exception\RuntimeException;
+use Shlinkio\Shlink\IpGeolocation\Exception\RuntimeException;
 use Shlinkio\Shlink\IpGeolocation\GeoLite2\DbUpdaterInterface;
 use Symfony\Component\Lock\Factory as Locker;
 use Throwable;
diff --git a/module/CLI/test/Command/Visit/UpdateDbCommandTest.php b/module/CLI/test/Command/Visit/UpdateDbCommandTest.php
index ea4e0861..2ebd6a38 100644
--- a/module/CLI/test/Command/Visit/UpdateDbCommandTest.php
+++ b/module/CLI/test/Command/Visit/UpdateDbCommandTest.php
@@ -8,7 +8,7 @@ use Prophecy\Argument;
 use Prophecy\Prophecy\ObjectProphecy;
 use Shlinkio\Shlink\CLI\Command\Visit\UpdateDbCommand;
 use Shlinkio\Shlink\CLI\Util\ExitCodes;
-use Shlinkio\Shlink\Common\Exception\RuntimeException;
+use Shlinkio\Shlink\IpGeolocation\Exception\RuntimeException;
 use Shlinkio\Shlink\IpGeolocation\GeoLite2\DbUpdaterInterface;
 use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Tester\CommandTester;
diff --git a/module/CLI/test/Util/GeolocationDbUpdaterTest.php b/module/CLI/test/Util/GeolocationDbUpdaterTest.php
index 137e70de..6a8dcceb 100644
--- a/module/CLI/test/Util/GeolocationDbUpdaterTest.php
+++ b/module/CLI/test/Util/GeolocationDbUpdaterTest.php
@@ -11,7 +11,7 @@ use Prophecy\Argument;
 use Prophecy\Prophecy\ObjectProphecy;
 use Shlinkio\Shlink\CLI\Exception\GeolocationDbUpdateFailedException;
 use Shlinkio\Shlink\CLI\Util\GeolocationDbUpdater;
-use Shlinkio\Shlink\Common\Exception\RuntimeException;
+use Shlinkio\Shlink\IpGeolocation\Exception\RuntimeException;
 use Shlinkio\Shlink\IpGeolocation\GeoLite2\DbUpdaterInterface;
 use Symfony\Component\Lock;
 use Throwable;
diff --git a/module/Common/src/Exception/PreviewGenerationException.php b/module/Common/src/Exception/PreviewGenerationException.php
index 726e60fa..a889474a 100644
--- a/module/Common/src/Exception/PreviewGenerationException.php
+++ b/module/Common/src/Exception/PreviewGenerationException.php
@@ -3,6 +3,8 @@ declare(strict_types=1);
 
 namespace Shlinkio\Shlink\Common\Exception;
 
+use RuntimeException;
+
 use function sprintf;
 
 /** @deprecated */
diff --git a/module/Common/src/Exception/RuntimeException.php b/module/IpGeolocation/src/Exception/RuntimeException.php
similarity index 76%
rename from module/Common/src/Exception/RuntimeException.php
rename to module/IpGeolocation/src/Exception/RuntimeException.php
index 6fad16aa..d55a5af9 100644
--- a/module/Common/src/Exception/RuntimeException.php
+++ b/module/IpGeolocation/src/Exception/RuntimeException.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace Shlinkio\Shlink\Common\Exception;
+namespace Shlinkio\Shlink\IpGeolocation\Exception;
 
 use RuntimeException as SplRuntimeException;
 
diff --git a/module/IpGeolocation/src/Exception/WrongIpException.php b/module/IpGeolocation/src/Exception/WrongIpException.php
index 5079d18d..8314e662 100644
--- a/module/IpGeolocation/src/Exception/WrongIpException.php
+++ b/module/IpGeolocation/src/Exception/WrongIpException.php
@@ -3,7 +3,7 @@ declare(strict_types=1);
 
 namespace Shlinkio\Shlink\IpGeolocation\Exception;
 
-use Shlinkio\Shlink\Common\Exception\RuntimeException;
+use Shlinkio\Shlink\IpGeolocation\Exception\RuntimeException;
 use Throwable;
 
 use function sprintf;
diff --git a/module/IpGeolocation/src/GeoLite2/DbUpdater.php b/module/IpGeolocation/src/GeoLite2/DbUpdater.php
index 23144356..8f8af889 100644
--- a/module/IpGeolocation/src/GeoLite2/DbUpdater.php
+++ b/module/IpGeolocation/src/GeoLite2/DbUpdater.php
@@ -8,7 +8,7 @@ use GuzzleHttp\ClientInterface;
 use GuzzleHttp\Exception\GuzzleException;
 use GuzzleHttp\RequestOptions;
 use PharData;
-use Shlinkio\Shlink\Common\Exception\RuntimeException;
+use Shlinkio\Shlink\IpGeolocation\Exception\RuntimeException;
 use Symfony\Component\Filesystem\Exception as FilesystemException;
 use Symfony\Component\Filesystem\Filesystem;
 use Throwable;
diff --git a/module/IpGeolocation/src/GeoLite2/DbUpdaterInterface.php b/module/IpGeolocation/src/GeoLite2/DbUpdaterInterface.php
index b7763964..f787dca3 100644
--- a/module/IpGeolocation/src/GeoLite2/DbUpdaterInterface.php
+++ b/module/IpGeolocation/src/GeoLite2/DbUpdaterInterface.php
@@ -3,7 +3,7 @@ declare(strict_types=1);
 
 namespace Shlinkio\Shlink\IpGeolocation\GeoLite2;
 
-use Shlinkio\Shlink\Common\Exception\RuntimeException;
+use Shlinkio\Shlink\IpGeolocation\Exception\RuntimeException;
 
 interface DbUpdaterInterface
 {
diff --git a/module/IpGeolocation/test/GeoLite2/DbUpdaterTest.php b/module/IpGeolocation/test/GeoLite2/DbUpdaterTest.php
index 7c4eaebb..63777440 100644
--- a/module/IpGeolocation/test/GeoLite2/DbUpdaterTest.php
+++ b/module/IpGeolocation/test/GeoLite2/DbUpdaterTest.php
@@ -8,7 +8,7 @@ use GuzzleHttp\Exception\ClientException;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 use Prophecy\Prophecy\ObjectProphecy;
-use Shlinkio\Shlink\Common\Exception\RuntimeException;
+use Shlinkio\Shlink\IpGeolocation\Exception\RuntimeException;
 use Shlinkio\Shlink\IpGeolocation\GeoLite2\DbUpdater;
 use Shlinkio\Shlink\IpGeolocation\GeoLite2\GeoLite2Options;
 use Symfony\Component\Filesystem\Exception as FilesystemException;