diff --git a/AsyncDisplayKit/ASViewController.h b/AsyncDisplayKit/ASViewController.h
index a00cebd90d..e3b18661fe 100644
--- a/AsyncDisplayKit/ASViewController.h
+++ b/AsyncDisplayKit/ASViewController.h
@@ -11,8 +11,9 @@
 
 @interface ASViewController : UIViewController
 
-@property (nonatomic, strong, readonly, nonnull) ASDisplayNode *node;
+@property (nonatomic, strong, readonly) ASDisplayNode *node;
 
-- (nullable instancetype)initWithNode:(nonnull ASDisplayNode *)node;
+//TODO Use nonnull annotation late on. Travis doesn't recognize it (yet).
+- (instancetype)initWithNode:(ASDisplayNode *)node;
 
 @end
diff --git a/AsyncDisplayKit/ASViewController.m b/AsyncDisplayKit/ASViewController.m
index 77395356f2..2a9f555178 100644
--- a/AsyncDisplayKit/ASViewController.m
+++ b/AsyncDisplayKit/ASViewController.m
@@ -18,6 +18,7 @@
     return nil;
   }
   
+  ASDisplayNodeAssertNotNil(node, @"Node must not be nil");
   ASDisplayNodeAssertTrue(!node.layerBacked);
   _node = node;