diff --git a/gql.go b/gql.go
index b7c788e..1d58915 100644
--- a/gql.go
+++ b/gql.go
@@ -454,7 +454,7 @@ func MakeGQLHandlers(ctx * GraphContext, server * GQLThread) (func(http.Response
   valid_nodes := map[reflect.Type]*graphql.Object{}
   valid_lockables := map[reflect.Type]*graphql.Object{}
   valid_threads := map[reflect.Type]*graphql.Object{}
-  valid_lockables[reflect.TypeOf((*BaseLockable)(nil))] = GQLTypeBaseNode()
+  valid_lockables[reflect.TypeOf((*BaseLockable)(nil))] = GQLTypeBaseLockable()
   for t, v := range(valid_lockables) {
     valid_nodes[t] = v
   }
diff --git a/gql_graph.go b/gql_graph.go
index 734a1e0..28056b2 100644
--- a/gql_graph.go
+++ b/gql_graph.go
@@ -560,7 +560,6 @@ func GQLTypeBaseLockable() * graphql.Object {
       IsTypeOf: func(p graphql.IsTypeOfParams) bool {
         ctx, ok := p.Context.Value("graph_context").(*GraphContext)
         if ok == false {
-          panic("PANIC_AT_THE_DISCO")
           return false
         }