diff --git a/src/hostcalls.rs b/src/hostcalls.rs
index f1c47793..8132f769 100644
--- a/src/hostcalls.rs
+++ b/src/hostcalls.rs
@@ -414,8 +414,10 @@ pub fn get_property(path: Vec<&str>) -> Result<Option<Bytes>, Status> {
                 } else {
                     Ok(None)
                 }
-            }
+            },
             Status::NotFound => Ok(None),
+            Status::SerializationFailure => Err(Status::SerializationFailure),
+            Status::InternalFailure => Err(Status::InternalFailure),
             status => panic!("unexpected status: {}", status as u32),
         }
     }
diff --git a/src/types.rs b/src/types.rs
index 43375d87..444bdfef 100644
--- a/src/types.rs
+++ b/src/types.rs
@@ -46,14 +46,9 @@ pub enum Status {
     BadArgument = 2,
     SerializationFailure = 3,
     ParseFailure = 4,
-    BadExpression = 5,
-    InvalidMemoryAccess = 6,
     Empty = 7,
     CasMismatch = 8,
-    ResultMismatch = 9,
     InternalFailure = 10,
-    BrokenConnection = 11,
-    Unimplemented = 12,
 }
 
 #[repr(u32)]