diff --git a/src/kernel/building.c b/src/kernel/building.c
index 92a4fd6f1..bcc914cca 100644
--- a/src/kernel/building.c
+++ b/src/kernel/building.c
@@ -75,15 +75,16 @@ static building_type *bt_find_i(const char *name)
     if (match) {
         cb_get_kv(match, &btype, sizeof(btype));
     }
-    else {
-        log_warning("st_find: could not find ship '%s'\n", name);
-    }
     return btype;
 }
 
 const building_type *bt_find(const char *name)
 {
-    return bt_find_i(name);
+    building_type *btype = bt_find_i(name);
+    if (!btype) {
+        log_warning("bt_find: could not find building '%s'\n", name);
+    }
+    return btype;
 }
 
 static int bt_changes = 1;
diff --git a/src/kernel/ship.c b/src/kernel/ship.c
index 3a7608789..220c16619 100644
--- a/src/kernel/ship.c
+++ b/src/kernel/ship.c
@@ -97,14 +97,15 @@ static ship_type *st_find_i(const char *name)
     if (match) {
         cb_get_kv(match, &st, sizeof(st));
     }
-    else {
-        log_warning("st_find: could not find ship '%s'\n", name);
-    }
     return st;
 }
 
 const ship_type *st_find(const char *name) {
-    return st_find_i(name);
+    ship_type *st = st_find_i(name);
+    if (!st) {
+        log_warning("st_find: could not find ship '%s'\n", name);
+    }
+    return st;
 }
 
 static void st_register(ship_type *stype) {
diff --git a/src/spells.c b/src/spells.c
index fa3d9a368..da60bfc57 100644
--- a/src/spells.c
+++ b/src/spells.c
@@ -6848,7 +6848,8 @@ void register_spells(void)
 #ifdef COMPAT_DEATHCLOUD
     at_deprecate("zauber_todeswolke", dc_read_compat);
 #endif
-
+    at_register(&at_observer);
+    
     /* init_firewall(); */
     ct_register(&ct_firewall);
     ct_register(&ct_deathcloud);