diff --git a/evennia/server/evennia_launcher.py b/evennia/server/evennia_launcher.py
index 6ad1818284..2a5ee8b0a5 100644
--- a/evennia/server/evennia_launcher.py
+++ b/evennia/server/evennia_launcher.py
@@ -805,11 +805,6 @@ def error_check_python_modules():
     imp(settings.BASE_ROOM_TYPECLASS)
     imp(settings.BASE_EXIT_TYPECLASS)
     imp(settings.BASE_SCRIPT_TYPECLASS)
-    # changed game dir settings file names
-    if os.path.isfile(os.path.join("server", "conf", "inlinefunc.py")):
-        raise DeprecationWarning("Name change: mygame/server/conf/inlinefunc.py should "
-              "be renamed to mygame/server/conf/inlinefuncs.py (note the S at the end)")
-
 
 
 def init_game_directory(path, check_db=True):
diff --git a/evennia/utils/inlinefuncs.py b/evennia/utils/inlinefuncs.py
index 01fc3a6420..70d25719b6 100644
--- a/evennia/utils/inlinefuncs.py
+++ b/evennia/utils/inlinefuncs.py
@@ -166,7 +166,16 @@ _INLINE_FUNCS = {"nomatch": lambda *args, **kwargs: "<UKNOWN>",
 
 # load custom inline func modules.
 for module in utils.make_iter(settings.INLINEFUNC_MODULES):
-    _INLINE_FUNCS.update(utils.callables_from_module(module))
+    try:
+        _INLINE_FUNCS.update(utils.callables_from_module(module))
+    except ImportError as err:
+        if module == "server.conf.inlinefuncs":
+            # a temporary warning since the default module changed name
+            raise ImportError("Error: %s\nPossible reason: mygame/server/conf/inlinefunc.py should "
+                  "be renamed to mygame/server/conf/inlinefuncs.py (note the S at the end)." % err)
+        else:
+            raise
+
 
 # remove the core function if we include examples in this module itself
 #_INLINE_FUNCS.pop("inline_func_parse", None)