If you try with the default theme (RWD) and you got a confirmation for the patch and then, with your custom templates you got a warning, is possible that your templates has some error or miss some of the fixes introduced by the patch.
You'll need to check again those phtml and apply the fixes manually.