diff --git a/KREngine/kraken/KRResource+fbx.cpp b/KREngine/kraken/KRResource+fbx.cpp
index 18958d8..d54adcf 100644
--- a/KREngine/kraken/KRResource+fbx.cpp
+++ b/KREngine/kraken/KRResource+fbx.cpp
@@ -35,6 +35,8 @@
 #define IOS_REF (*(pSdkManager->GetIOSettings()))
 #endif
 
+#define warning(e,s) if(!(e))printf("WARNING: %s\n",s)
+
 void InitializeSdkObjects(FbxManager*& pSdkManager, FbxScene*& pScene);
 void DestroySdkObjects(FbxManager* pSdkManager);
 bool LoadScene(FbxManager* pSdkManager, FbxDocument* pScene, const char* pFilename);
@@ -893,10 +895,10 @@ void LoadNode(FbxScene* pFbxScene, KRNode *parent_node, FbxGeometryConverter *pG
     FbxVector4 lZero(0.0, 0.0, 0.0);
     FbxVector4 lOne(1.0, 1.0, 1.0);
     
-    assert(geometric_rotation == lZero);
-    assert(geometric_translation == lZero);
-    assert(geometric_scaling == lOne);
-    assert(rotation_order == eEulerXYZ);
+    warning((geometric_rotation == lZero), "Geometric Rotation not supported .. 3DSMax file??");
+    warning((geometric_translation == lZero), "Geometric Rotation not supported .. 3DSMax file??");
+    warning((geometric_scaling == lOne), "Geometric Rotation not supported .. 3DSMax file??");
+    warning((rotation_order == eEulerXYZ), "Geometric Rotation not supported .. 3DSMax file??");
     
     // FINDME - node_key_frame_position contains the key frame (start location) for an animation node
     // node_has_n_points
diff --git a/KREngine/kraken/KRSceneManager.cpp b/KREngine/kraken/KRSceneManager.cpp
index ff0ded7..4489f05 100644
--- a/KREngine/kraken/KRSceneManager.cpp
+++ b/KREngine/kraken/KRSceneManager.cpp
@@ -65,15 +65,20 @@ KRScene *KRSceneManager::getScene(const std::string &name) {
     std::transform(lowerName.begin(), lowerName.end(),
                    lowerName.begin(), ::tolower);
     
-    return m_scenes[lowerName];
+    static unordered_map<std::string, KRScene *>::iterator scene_itr = m_scenes.find(lowerName);
+    if(scene_itr != m_scenes.end()) {
+        return (*scene_itr).second;
+    } else {
+        return NULL;
+    }
 }
 
 KRScene *KRSceneManager::getFirstScene() {
     static unordered_map<std::string, KRScene *>::iterator scene_itr = m_scenes.begin();
-    if(scene_itr == m_scenes.end()) {
-        return NULL;
-    } else {
+    if(scene_itr != m_scenes.end()) {
         return (*scene_itr).second;
+    } else {
+        return NULL;
     }
 }