diff --git a/src/eepp/ui/css/stylesheetspecification.cpp b/src/eepp/ui/css/stylesheetspecification.cpp
index 1c2317a16..273e17f2c 100644
--- a/src/eepp/ui/css/stylesheetspecification.cpp
+++ b/src/eepp/ui/css/stylesheetspecification.cpp
@@ -165,7 +165,8 @@ void StyleSheetSpecification::registerDefaultProperties() {
 	registerProperty( "font-family", "", false ).addAlias( "font-name" );
 	registerProperty( "font-size", "", false )
 		.setType( PropertyType::NumberFloat )
-		.addAlias( "text-size" );
+		.addAlias( "text-size" )
+		.addAlias( "textsize" );
 	registerProperty( "font-style", "", false )
 		.addAlias( "text-style" )
 		.addAlias( "text-decoration" );
@@ -271,6 +272,8 @@ void StyleSheetSpecification::registerDefaultProperties() {
 
 	registerProperty( "scale-origin-point", "", false ).setType( PropertyType::Vector2 );
 
+	registerProperty( "word-wrap", "", false ).setType( PropertyType::Bool );
+
 	// Shorthands
 	registerProperty( "background-position", "", false ).setType( PropertyType::NumberLength );
 	registerProperty( "transition", "", false );
diff --git a/src/eepp/ui/uistyle.cpp b/src/eepp/ui/uistyle.cpp
index a7f6c4e30..33fa23563 100644
--- a/src/eepp/ui/uistyle.cpp
+++ b/src/eepp/ui/uistyle.cpp
@@ -167,7 +167,7 @@ void UIStyle::onStateChange() {
 				}
 			}
 
-			if ( !mWidget->isSceneNodeLoading() &&
+			if ( !mWidget->isSceneNodeLoading() && NULL != propertyDefinition &&
 				 StyleSheetPropertyTransition::transitionSupported(
 					 propertyDefinition->getType() ) &&
 				 hasTransition( property.getName() ) ) {