diff --git a/lib/checkother.cpp b/lib/checkother.cpp
index 68caacd93..89255d9a2 100644
--- a/lib/checkother.cpp
+++ b/lib/checkother.cpp
@@ -1331,6 +1331,9 @@ void CheckOther::uninitvar()
             }
             if (Token::Match(tok, "[{};] %type% *| %var% ;"))
             {
+                if (Token::Match(tok->next(), "return|goto"))
+                    continue;
+                
                 // if it's a pointer, dereferencing is forbidden
                 const bool pointer(tok->strAt(2) == std::string("*"));