diff --git a/src/IKVM.NET.Sdk/targets/IKVM.Java.DesignTime.targets b/src/IKVM.NET.Sdk/targets/IKVM.Java.DesignTime.targets
index 8caaf0f13..90659195d 100644
--- a/src/IKVM.NET.Sdk/targets/IKVM.Java.DesignTime.targets
+++ b/src/IKVM.NET.Sdk/targets/IKVM.Java.DesignTime.targets
@@ -3,6 +3,10 @@
         <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
     </PropertyGroup>
 
+    <Target Name="_CheckCompileDesignTimePrerequisite">
+        <Error Condition="'$(SkipCompilerExecution)|$(ProvideCommandLineArgs)' != 'true|true'" Text="SkipCompilerExecution and ProvideCommandLineArgs should be set before calling the CompileDesignTime target" />
+    </Target>
+
     <PropertyGroup>
         <ManagedDesignTimeTargetsPath Condition=" '$(ManagedDesignTimeTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\VisualStudio\Managed\Microsoft.Managed.DesignTime.targets</ManagedDesignTimeTargetsPath>
     </PropertyGroup>
@@ -26,7 +30,7 @@
         </PropertyPageSchema>
     </ItemGroup>
 
-    <Target Name="CompileDesignTime" DependsOnTargets="_CheckCompileDesignTimePrerequisite;Compile">
+    <Target Name="CompileDesignTime" DependsOnTargets="_CheckCompileDesignTimePrerequisite;Compile" Condition=" '$(IsCrossTargetingBuild)' != 'true' ">
         <Message Text="CompileDesignTime" />
     </Target>