diff --git a/src/windows/CDVOrientationProxy.js b/src/windows/CDVOrientationProxy.js
index ea28811..214994a 100644
--- a/src/windows/CDVOrientationProxy.js
+++ b/src/windows/CDVOrientationProxy.js
@@ -22,6 +22,10 @@
 var DisplayInfo = Windows.Graphics.Display.DisplayInformation;
 var Orientations = Windows.Graphics.Display.DisplayOrientations;
 
+if (!window.Promise) {
+    window.Promise = WinJS.Promise;
+}
+
 module.exports = {
     screenOrientation: function (win, fail, args) {
         //console.log("screenOrientation proxy called with " + args);
diff --git a/www/screenorientation.js b/www/screenorientation.js
index 022e0ba..0bdb814 100644
--- a/www/screenorientation.js
+++ b/www/screenorientation.js
@@ -98,7 +98,6 @@ var onChangeListener = null;
 
 Object.defineProperty(screen.orientation, 'onchange', {
     set: function(listener) {
-        console.log("setting onchange to : " + listener);
 
         if (onChangeListener != null) {
             screen.orientation.removeEventListener('change', onChangeListener);
@@ -144,8 +143,11 @@ function setOrientationProperties() {
         case -90:
             screen.orientation.type = 'landscape-secondary';
             break;
+        default:
+            screen.orientation.type = 'portrait-primary';
+            break;
     }
-    screen.orientation.angle = window.orientation;
+    screen.orientation.angle = window.orientation || 0;
 
 }
 window.addEventListener("orientationchange", orientationchange, true);