diff --git a/reactos/base/applications/imagesoft/imagesoft.c b/reactos/base/applications/imagesoft/imagesoft.c
index 19ed215d8b5..5b5dcf580a4 100644
--- a/reactos/base/applications/imagesoft/imagesoft.c
+++ b/reactos/base/applications/imagesoft/imagesoft.c
@@ -29,19 +29,28 @@ WinMain(HINSTANCE hThisInstance,
     if (!AllocAndLoadString(&lpAppName, hInstance, IDS_APPNAME) ||
         !AllocAndLoadString(&lpVersion, hInstance, IDS_VERSION) )
     {
-        return 1;
+        return Ret;
     }
 
     len = (int)_tcslen(lpAppName) + (int)_tcslen(lpVersion);
     lpTitle = HeapAlloc(ProcessHeap,
                         0,
                         (len + 2) * sizeof(TCHAR));
+    if (lpTitle == NULL)
+    {
+        LocalFree((HLOCAL)lpAppName);
+        LocalFree((HLOCAL)lpVersion);
+        return Ret;
+    }
 
     wsprintf(lpTitle,
              _T("%s %s"),
              lpAppName,
              lpVersion);
 
+    LocalFree((HLOCAL)lpAppName);
+    LocalFree((HLOCAL)lpVersion);
+
     if (TbdInitImpl())
     {
         if (InitMainWindowImpl())
@@ -62,7 +71,6 @@ WinMain(HINSTANCE hThisInstance,
                         {
                             if (bRet != (BOOL)-1)
                             {
-                                //if (Msg.message == WM_SIZE) MessageBox(NULL, _T("Got it"), NULL, 0);
                                 if (!MainWndTranslateMDISysAccel(hMainWnd,
                                                                  &Msg))
                                 {
@@ -87,7 +95,9 @@ WinMain(HINSTANCE hThisInstance,
         TbdUninitImpl();
     }
 
-    LocalFree((HLOCAL)lpAppName);
+    HeapFree(GetProcessHeap(), 
+             0, 
+             lpTitle);
 
     return Ret;
 }