diff --git a/src/SConscript b/src/SConscript
index db0584ed3..9dbfa2d0f 100644
--- a/src/SConscript
+++ b/src/SConscript
@@ -288,8 +288,18 @@ else:
     env['create_uninstall_target'](env, os.path.join(target_path,mapnik_libname))
 
 includes = glob.glob('../include/mapnik/*.hpp')
+svg_includes = glob.glob('../include/mapnik/svg/*.hpp')
+wkt_includes = glob.glob('../include/mapnik/wkt/*.hpp')
 
 inc_target = os.path.normpath(install_prefix+'/include/mapnik')
+svg_inc_target = os.path.normpath(install_prefix+'/include/mapnik/svg')
+wkt_inc_target = os.path.normpath(install_prefix+'/include/mapnik/wkt')
+
 if 'uninstall' not in COMMAND_LINE_TARGETS:
     env.Alias(target='install', source=env.Install(inc_target, includes))
+    env.Alias(target='install', source=env.Install(svg_inc_target, svg_includes))
+    env.Alias(target='install', source=env.Install(wkt_inc_target, wkt_includes))
+
 env['create_uninstall_target'](env, inc_target)
+env['create_uninstall_target'](env, svg_inc_target)
+env['create_uninstall_target'](env, wkt_inc_target)
\ No newline at end of file
diff --git a/src/marker_cache.cpp b/src/marker_cache.cpp
index 16a1d1e63..f8720c628 100644
--- a/src/marker_cache.cpp
+++ b/src/marker_cache.cpp
@@ -99,8 +99,8 @@ boost::optional<marker_ptr> marker_cache::find(std::string const& uri, bool upda
         }
         else
         {
-            try
-            {
+            //try
+            //{
                 std::auto_ptr<mapnik::image_reader> reader(mapnik::get_image_reader(uri));
                 if (reader.get())
                 {
@@ -116,12 +116,12 @@ boost::optional<marker_ptr> marker_cache::find(std::string const& uri, bool upda
                         cache_.insert(std::make_pair(uri,*result));
                     }
                 }
-            }
+            //}
 
-            catch (...)
+            /*catch (...)
             {
                 std::cerr << "Exception caught while loading image: " << uri << std::endl;
-            }
+            }*/
         }
     }
     else