diff --git a/intern/itasc/kdl/frames.hpp b/intern/itasc/kdl/frames.hpp
index 01213f91d5a..2a1ed3296f9 100644
--- a/intern/itasc/kdl/frames.hpp
+++ b/intern/itasc/kdl/frames.hpp
@@ -299,7 +299,7 @@ public:
     double data[9];
 
     inline Rotation() {
-		*this = Rotation::Identity();
+		*this = Identity();
 	}
     inline Rotation(double Xx,double Yx,double Zx,
                 double Xy,double Yy,double Zy,
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index a5748201d32..38454547f48 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -4028,8 +4028,10 @@ static void direct_link_modifiers(FileData *fd, ListBase *lb)
 			FluidsimModifierData *fluidmd = (FluidsimModifierData*) md;
 			
 			fluidmd->fss= newdataadr(fd, fluidmd->fss);
-			fluidmd->fss->fmd= fluidmd;
-			fluidmd->fss->meshVelocities = NULL;
+			if(fluidmd->fss) {
+				fluidmd->fss->fmd= fluidmd;
+				fluidmd->fss->meshVelocities = NULL;
+			}
 		}
 		else if (md->type==eModifierType_Smoke) {
 			SmokeModifierData *smd = (SmokeModifierData*) md;