diff --git a/src/msh.c b/src/msh.c
index cc48b34..2db3f47 100644
--- a/src/msh.c
+++ b/src/msh.c
@@ -45,7 +45,6 @@ int main(int argc, char** argv) {
     int ntokens = 0;
 
     int i;
-    int result;
 
     int pid;
     int laststatus = 0;
@@ -61,7 +60,7 @@ int main(int argc, char** argv) {
 
     user = secure_getenv("USER");
 
-    result = uname(&uts);
+    int result = uname(&uts);
     if (result != 0) {
         fprintf(stderr, "Error: %s\n", strerror(errno));
         return errno;
@@ -70,7 +69,11 @@ int main(int argc, char** argv) {
     host = uts.nodename;
 
     while(1) {
-        getcwd(pwd, LINESIZE - 1);
+        char* result = getcwd(pwd, LINESIZE - 1);
+        if (result == NULL) {
+            return 1;
+        }
+
         pwd_disp = pwd;
 
         pretty_path_home(&pwd_disp);