diff --git a/ionic/components/text-input/test/inline-labels/main.html b/ionic/components/text-input/test/inline-labels/main.html
index bdd43cd9b1..38668016bb 100644
--- a/ionic/components/text-input/test/inline-labels/main.html
+++ b/ionic/components/text-input/test/inline-labels/main.html
@@ -76,6 +76,16 @@
         <textarea>KA-CHOW!</textarea>
       </ion-input>
 
+      <ion-input>
+        <ion-label>Beginning:</ion-label>
+        <input value="2005-07-30" type="date">
+      </ion-input>
+
+      <ion-input>
+        <ion-label>Time:</ion-label>
+        <input value="12:00pm" type="time">
+      </ion-input>
+
     </ion-list>
 
     <ion-input>
diff --git a/ionic/components/text-input/text-input.ts b/ionic/components/text-input/text-input.ts
index dffe2ff1f3..65de14e964 100644
--- a/ionic/components/text-input/text-input.ts
+++ b/ionic/components/text-input/text-input.ts
@@ -106,7 +106,7 @@ export class TextInput {
    * This function is used to add the Angular css classes associated with inputs in forms
    */
    addNgClass(className) {
-     return this.input.elementRef.nativeElement.classList.contains(className);
+     this.input && this.input.elementRef.nativeElement.classList.contains(className);
    }
 
   /**
@@ -456,7 +456,7 @@ export class TextInput {
  * @private
  */
 @Directive({
-  selector: 'textarea,input[type=text],input[type=password],input[type=number],input[type=search],input[type=email],input[type=url],input[type=tel]',
+  selector: 'textarea,input[type=text],input[type=password],input[type=number],input[type=search],input[type=email],input[type=url],input[type=tel],input[type=date],input[type=datetime],input[type=datetime-local],input[type=week],input[type=time]',
   inputs: ['value'],
   host: {
     '(focus)': 'focusChange(true)',