2 files changed, 6 insertions, 0 deletions

diff --git a/src/gamebuilder.cpp b/src/gamebuilder.cpp
index 353e254..bfeffec 100644
--- a/src/gamebuilder.cpp
+++ b/src/gamebuilder.cpp
@@ -177,6 +177,8 @@ void GameBuilder::closeGlobal()
 
 void GameBuilder::beginCommand( const Bu::String &sValue )
 {
+        if( !bGlobal && pCurSit->getInputType() != Situation::inputCommand )
+                throw Bu::ExceptionBase("Command in non-command situation.");
         pCurNode = pCurRoot = new AstBranch( AstNode::tScope );
         pCurCmd = new Command();
         pCurCmd->addLiteral( sValue );
@@ -221,6 +223,8 @@ void GameBuilder::closeCommand()
 
 void GameBuilder::beginOption( const Bu::String &sValue )
 {
+        if( pCurSit->getInputType() != Situation::inputOption )
+                throw Bu::ExceptionBase("Option in non-option situation.");
         pCurNode = pCurRoot = new AstBranch( AstNode::tScope );
         pCurCmd = new Command();
         pCurCmd->addLiteral( sValue );
diff --git a/src/situation.cpp b/src/situation.cpp
index 923eea7..1d3a853 100644
--- a/src/situation.cpp
+++ b/src/situation.cpp
@@ -75,5 +75,7 @@ Bu::Formatter &operator<<( Bu::Formatter &f, Situation::Mode m )
                 case Situation::modeEnter:
                         return f << "Enter";
         }
+
+        return f << "**ERROR**";
 }