diff --git a/src/actions/tutorialActions.js b/src/actions/tutorialActions.js
index 08cf8d7..a73638b 100644
--- a/src/actions/tutorialActions.js
+++ b/src/actions/tutorialActions.js
@@ -18,9 +18,9 @@ export const tutorialCheck = (status) => (dispatch, getState) => {
 };
 
 export const storeTutorialXml = (code) => (dispatch, getState) => {
-  var tutorialsStatus = getState().tutorial.status;
   var id = getState().tutorial.currentId;
-  if(id){
+  if(id !== null){
+    var tutorialsStatus = getState().tutorial.status;
     tutorialsStatus[id] = {...tutorialsStatus[id], xml: code};
     dispatch({
       type: TUTORIAL_XML,
diff --git a/src/components/ClearWorkspace.js b/src/components/ClearWorkspace.js
index 64cf1cd..2e31b01 100644
--- a/src/components/ClearWorkspace.js
+++ b/src/components/ClearWorkspace.js
@@ -39,7 +39,7 @@ class ClearWorkspace extends Component {
 
 ClearWorkspace.propTypes = {
   clearStats: PropTypes.func.isRequired,
-  onChangeWorkspace: PropTypes.func.isRequired
+  onChangeCode: PropTypes.func.isRequired
 };
 
 
diff --git a/src/components/Tutorial/Tutorial.js b/src/components/Tutorial/Tutorial.js
index a3383c6..3b48c09 100644
--- a/src/components/Tutorial/Tutorial.js
+++ b/src/components/Tutorial/Tutorial.js
@@ -100,7 +100,7 @@ class Tutorial extends Component {
 
 Tutorial.propTypes = {
   tutorialId: PropTypes.func.isRequired,
-  currentTutorialId: PropTypes.number.isRequired,
+  currentTutorialId: PropTypes.number,
   status: PropTypes.array.isRequired,
   change: PropTypes.number.isRequired
 };