diff --git a/infer/models/c/src/libc_basic.c b/infer/models/c/src/libc_basic.c
index 0b1ee8f43..1c4cb52e1 100644
--- a/infer/models/c/src/libc_basic.c
+++ b/infer/models/c/src/libc_basic.c
@@ -647,25 +647,35 @@ FILE *fdopen(int fildes, const char *mode) {
 }
 
 // return nonteterministically 0 or -1
+// requires stream to be allocated
 int fseek(FILE *stream, long int offset, int whence) {
   int n;
+  FILE tmp;
+  tmp = *stream;
   n = __infer_nondet_int();
   if (n) return 0;
   else return -1;
 }
 
 // return nondeterministically a nonnegative value or -1
+// requires stream to be allocated
 long int ftell(FILE *stream) {
   int n;
+  FILE tmp;
+  tmp = *stream;
   n = __infer_nondet_int();
   if (n>=0) return n;
   else return -1;
 }
 
 // on success return str otherwise null
+// requires stream to be allocated
 char *fgets( char *str, int num, FILE *stream ) {
   int n;
   int size1;
+  FILE tmp;
+    
+  tmp = *stream;
   n = __infer_nondet_int();
 
   if (n>0) {
@@ -695,19 +705,24 @@ int puts(const char *str) {
 }
 
 // modeled using puts
+// require the stream to be allocated
 int fputs(const char *str, FILE *stream) {
+  FILE tmp;
+  tmp = *stream;
   return puts(str);
 }
 
 // return a nondeterministic value
+// requires stream to be allocated
 int getc(FILE *stream)
 {
   FILE tmp;
-    tmp = *stream;
+  tmp = *stream;
   return __infer_nondet_int();
 }
 
 // return a nondeterministic value
+// requires stream to be allocated
 int fgetc(FILE *stream)
 {
   FILE tmp;
@@ -716,17 +731,23 @@ int fgetc(FILE *stream)
 }
 
 // return nondeterministically c or EOF
+// requires stream to be allocated
 int ungetc(int c, FILE *stream) {
   int n;
-
+  FILE tmp;
+  tmp = *stream;
+    
   n = __infer_nondet_int();
   if (n) return c;
   else return EOF;
 }
 
 // modeled like putc
+// requires stream to be allocated
 int fputc(int c, FILE *stream)
 {
+  FILE tmp;
+  tmp = *stream;
   return putc(c,stream);
 }
 
@@ -754,7 +775,10 @@ int rename(const char *old, const char *new) {
 }
 
 // modeled as skip
+// requires stream to be allocated
 void rewind(FILE *stream) {
+    FILE tmp;
+    tmp = *stream;
 }
 
 // modeled as just return a nondeterministic value
@@ -1174,9 +1198,12 @@ int printf(const char *format, ...)
 }
 
 // return a nondeterministic nonnegative integer
+// requires stream to be allocated
 int fprintf(FILE *stream, const char *format, ...)
 {
   int res;
+  FILE tmp;
+  tmp= *stream;
   res = __infer_nondet_int();
   INFER_EXCLUDE_CONDITION(res < 0);
   return res;
@@ -1204,9 +1231,13 @@ int sprintf(char *s, const char *format, ...)
 }
 
 // return a nondeterministic nonnegative integer
+// requires stream to be allocated
 int vfprintf(FILE *stream, const char *format, va_list arg)
 {
   int res;
+  FILE tmp;
+    
+  tmp= *stream;
   res = __infer_nondet_int();
   INFER_EXCLUDE_CONDITION(res < 0);
   return res;
@@ -1382,9 +1413,12 @@ long random(void) {
   return ret;
 }
 
+// requires stream to be allocated
 int putc(int c, FILE *stream){
   int rand;
-
+  FILE tmp;
+    
+  tmp = *stream;
   rand = __infer_nondet_int();
   if (rand > 0)
     return c; //success
@@ -1423,6 +1457,7 @@ size_t confstr(int name, char *buf, size_t len){
 }
 
 // return a non-deterministic value
+// stream is not required to be allocated
 int fflush(FILE *stream){
   return __infer_nondet_int();
 }
@@ -1582,8 +1617,11 @@ int pthread_mutexattr_gettype(const pthread_mutexattr_t *attr, int *type){
 }
 
 // return a positive non-deterministic number or -1.
+// requires stream to be allocated
 int fileno(FILE *stream){
   int ret = __infer_nondet_int();
+  FILE tmp;
+  tmp = *stream;
   INFER_EXCLUDE_CONDITION(ret<-1 || ret==0 );
   return ret;
 }
@@ -1657,22 +1695,37 @@ int sigaction(int sig, const struct sigaction *act, struct sigaction *oact){
 //It is normally a builtin that should not be implemented and LLVM complains about this
 
 // modelled as skip
+// stream is required to be allocated
 void clearerr(FILE *stream) {
+    FILE tmp;
+    tmp = *stream;
 }
 
 // return a nondeterministic value
+// stream required to be allocated
 int ferror(FILE *stream) {
+    
+  FILE tmp;
+  tmp = *stream;
   return __infer_nondet_int();
 }
 
 // return a nondeterministic value
+// stream required to be allocated
 int feof(FILE *stream) {
+    
+  FILE tmp;
+  tmp = *stream;
   return __infer_nondet_int();
 }
 
 // write to *pos and return either 0 or -1
+// stream is required to be allocated
 int fgetpos(FILE *__restrict stream, fpos_t *__restrict pos) {
+    
   int success;
+  FILE tmp;
+  tmp = *stream;
   fpos_t t;
   *pos = t;
   success = __infer_nondet_int();
@@ -1681,8 +1734,12 @@ int fgetpos(FILE *__restrict stream, fpos_t *__restrict pos) {
 }
 
 // read from *pos and return either 0 or -1
+// stream is required to be allocated
 int fsetpos(FILE *stream, const fpos_t *pos) {
+    
   int success;
+  FILE tmp;
+  tmp = *stream;
   fpos_t t;
   t = *pos;
   success = __infer_nondet_int();
diff --git a/infer/tests/codetoanalyze/c/errors/null_dereference/getc.c b/infer/tests/codetoanalyze/c/errors/null_dereference/getc.c
index ecf0ecb4d..abf51803d 100644
--- a/infer/tests/codetoanalyze/c/errors/null_dereference/getc.c
+++ b/infer/tests/codetoanalyze/c/errors/null_dereference/getc.c
@@ -4,7 +4,7 @@
 void crash_getc() {
     FILE *f;
     int i;
-    f = fopen("this_file_doesnt_exists", "r");
+    f = fopen("this_file_doesnt_exist", "r");
     i = getc(f);
     printf("i =%i\n", i);
     fclose(f);
@@ -13,7 +13,7 @@ void crash_getc() {
 void nocrash_getc() {
     FILE *f;
     int i;
-    f = fopen("this_file_doesnt_exists", "r");
+    f = fopen("this_file_doesnt_exist", "r");
     if (f) {
       i = getc(f);
       printf("i =%i\n", i);
@@ -24,7 +24,7 @@ void nocrash_getc() {
 void crash_fgetc() {
     FILE *f;
     int i;
-    f = fopen("this_file_doesnt_exists", "r");
+    f = fopen("this_file_doesnt_exist", "r");
     i = fgetc(f);
     printf("i =%i\n", i);
     fclose(f);
@@ -33,7 +33,7 @@ void crash_fgetc() {
 void nocrash_fgetc() {
     FILE *f;
     int i;
-    f = fopen("this_file_doesnt_exists", "r");
+    f = fopen("this_file_doesnt_exist", "r");
     if (f) {
       i = fgetc(f);
       printf("i =%i\n", i);
@@ -42,3 +42,355 @@ void nocrash_fgetc() {
 }
 
 
+void crash_ungetc()
+{
+    FILE *f;
+    
+    f = fopen("this_file_doesnt_exist", "r");
+    
+    int i =ungetc(10,f);
+    fclose(f);
+    
+}
+
+void nocrash_ungetc()
+{
+    FILE *f;
+    
+    f = fopen("this_file_doesnt_exist", "r");
+    if (f) {
+        int i =ungetc(10,f);
+        fclose(f);
+    }
+}
+
+void crash_fputs()
+{
+    FILE *f;
+    
+    f = fopen("this_file_doesnt_exist", "r");
+    fputs("blablabla", f);
+    fclose(f);
+    
+}
+
+void nocrash_fputs()
+{
+    FILE *f;
+    
+    f = fopen("this_file_doesnt_exist", "r");
+    if (f) {
+        fputs("blablabla", f);
+        fclose(f);
+    }
+}
+
+void crash_fputc()
+{
+    FILE *f;
+    
+    f = fopen("this_file_doesnt_exist", "r");
+    fputc(42, f);
+    fclose(f);
+    
+}
+
+void nocrash_fputc()
+{
+    FILE *f;
+    
+    f = fopen("this_file_doesnt_exist", "r");
+    if (f) {
+        fputc(42, f);
+        fclose(f);
+    }
+}
+
+void crash_putc()
+{
+    FILE *f;
+    
+    f = fopen("this_file_doesnt_exist", "r");
+    putc(42, f);
+    fclose(f);
+    
+}
+
+void nocrash_putc()
+{
+    FILE *f;
+    
+    f = fopen("this_file_doesnt_exist", "r");
+    if (f) {
+        putc(42, f);
+        fclose(f);
+    }
+}
+
+void crash_fseeks()
+{
+    FILE *f;
+    
+    f = fopen("this_file_doesnt_exist", "r");
+    fseek( f, 7, SEEK_SET );
+    fclose(f);
+    
+}
+
+void nocrash_fseek()
+{
+    FILE *f;
+    
+    f = fopen("this_file_doesnt_exist", "r");
+    if (f) {
+        fseek( f, 7, SEEK_SET );
+        fclose(f);
+    }
+}
+
+void crash_ftell()
+{
+    FILE *f;
+    
+    f = fopen("this_file_doesnt_exist", "r");
+    ftell(f);
+    fclose(f);
+    
+}
+
+void nocrash_ftell()
+{
+    FILE *f;
+    
+    f = fopen("this_file_doesnt_exist", "r");
+    if (f) {
+        ftell( f);
+        fclose(f);
+    }
+}
+
+void crash_fgets()
+{
+    FILE *f;
+    char str[60];
+    
+    f = fopen("this_file_doesnt_exist", "r");
+    fgets(str,60, f);
+    fclose(f);
+    
+}
+
+void nocrash_fgets()
+{
+    FILE *f;
+    char str[60];
+    
+    f = fopen("this_file_doesnt_exist", "r");
+    if (f) {
+        fgets(str,60, f);
+        fclose(f);
+    }
+}
+
+
+void crash_rewind()
+{
+    FILE *f;
+    
+    f = fopen("this_file_doesnt_exist", "r");
+    rewind(f);
+    fclose(f);
+    
+}
+
+void nocrash_rewind()
+{
+    FILE *f;
+    
+    f = fopen("this_file_doesnt_exist", "r");
+    if (f) {
+        rewind( f);
+        fclose(f);
+    }
+}
+
+void crash_fileno()
+{
+    FILE *f;
+    
+    f = fopen("this_file_doesnt_exist", "r");
+    fileno(f);
+    fclose(f);
+    
+}
+
+void nocrash_fileno()
+{
+    FILE *f;
+    
+    f = fopen("this_file_doesnt_exist", "r");
+    if (f) {
+        fileno( f);
+        fclose(f);
+    }
+}
+
+
+void crash_clearerr()
+{
+    FILE *f;
+    
+    f = fopen("this_file_doesnt_exist", "r");
+    clearerr(f);
+    fclose(f);
+    
+}
+
+void nocrash_clearerr()
+{
+    FILE *f;
+    
+    f = fopen("this_file_doesnt_exist", "r");
+    if (f) {
+        clearerr( f);
+        fclose(f);
+    }
+}
+
+void crash_ferror()
+{
+    FILE *f;
+    
+    f = fopen("this_file_doesnt_exist", "r");
+    ferror(f);
+    fclose(f);
+    
+}
+
+void nocrash_ferror()
+{
+    FILE *f;
+    
+    f = fopen("this_file_doesnt_exist", "r");
+    if (f) {
+        ferror( f);
+        fclose(f);
+    }
+}
+
+void crash_feof()
+{
+    FILE *f;
+    
+    f = fopen("this_file_doesnt_exist", "r");
+    feof(f);
+    fclose(f);
+    
+}
+
+void nocrash_feof()
+{
+    FILE *f;
+    
+    f = fopen("this_file_doesnt_exist", "r");
+    if (f) {
+        feof(f);
+        fclose(f);
+    }
+}
+
+
+
+void crash_fprintf()
+{
+    FILE *f;
+    
+    f = fopen("this_file_doesnt_exist", "r");
+    fprintf(f,"blablabla\n");
+    fclose(f);
+    
+}
+
+void nocrash_fprintf()
+{
+    FILE *f;
+    
+    f = fopen("this_file_doesnt_exist", "r");
+    if (f) {
+        fprintf(f,"blablabla\n");
+        fclose(f);
+    }
+}
+
+void crash_vfprintf()
+{
+    FILE *f;
+    va_list arg;
+    
+    f = fopen("this_file_doesnt_exist", "r");
+    vfprintf(f,"blablabla\n",arg);
+    fclose(f);
+    
+}
+
+void nocrash_vfprintf()
+{
+    FILE *f;
+    va_list arg;
+    
+    f = fopen("this_file_doesnt_exist", "r");
+    if (f) {
+        vfprintf(f,"blablabla\n",arg);
+        fclose(f);
+    }
+}
+
+
+void crash_fgetpos()
+{
+    FILE *f;
+    fpos_t position;
+    
+    f = fopen("this_file_doesnt_exist", "r");
+    fgetpos(f,&position);
+    fclose(f);
+    
+}
+
+void nocrash_fgetpos()
+{
+    FILE *f;
+    fpos_t position;
+    
+    f = fopen("this_file_doesnt_exist", "r");
+    if (f) {
+        fgetpos(f,&position);
+        fclose(f);
+    }
+}
+
+void crash_fsetpos()
+{
+    FILE *f;
+    fpos_t position;
+    
+    f = fopen("this_file_doesnt_exist", "r");
+    fsetpos(f,&position);
+    fclose(f);
+    
+}
+
+void nocrash_fsetpos()
+{
+    FILE *f;
+    fpos_t position;
+    
+    f = fopen("this_file_doesnt_exist", "r");
+    if (f) {
+        fsetpos(f,&position);
+        fclose(f);
+    }
+}
+
+
+
diff --git a/infer/tests/endtoend/c/NullDereferenceTest2.java b/infer/tests/endtoend/c/NullDereferenceTest2.java
index 5c9dae4be..80541d79e 100644
--- a/infer/tests/endtoend/c/NullDereferenceTest2.java
+++ b/infer/tests/endtoend/c/NullDereferenceTest2.java
@@ -38,6 +38,22 @@ public class NullDereferenceTest2 {
     String[] procedures = {
         "crash_getc",
         "crash_fgetc",
+        "crash_ungetc",
+        "crash_fputs",
+        "crash_fputc",
+        "crash_putc",
+        "crash_fseeks",
+        "crash_ftell",
+        "crash_fgets",
+        "crash_rewind",
+        "crash_fileno",
+        "crash_clearerr",
+        "crash_ferror",
+        "crash_feof",
+        "crash_fprintf",
+        "crash_vfprintf",
+        "crash_fgetpos",
+        "crash_fsetpos",
     };
     System.out.println(inferResults.toString());
     assertThat(