Index: trunk/ippScripts/scripts/warp_skycell.pl
===================================================================
--- trunk/ippScripts/scripts/warp_skycell.pl	(revision 15618)
+++ trunk/ippScripts/scripts/warp_skycell.pl	(revision 15690)
@@ -14,4 +14,8 @@
 
 use IPC::Cmd 0.36 qw( can_run run );
+use File::Spec;
+use File::Temp qw( tempfile );
+use Getopt::Long qw( GetOptions :config auto_help auto_version gnu_getopt );
+use Pod::Usage qw( pod2usage );
 use PS::IPP::Metadata::Config;
 use PS::IPP::Metadata::Stats;
@@ -29,10 +33,7 @@
 		       caturi
 		       );
+use PS::IPP::Operations qw( skycell_file );
+
 my $ipprc = PS::IPP::Config->new(); # IPP configuration
-use File::Spec;
-use File::Temp qw( tempfile );
-
-use Getopt::Long qw( GetOptions :config auto_help auto_version gnu_getopt );
-use Pod::Usage qw( pod2usage );
 
 my ($warp_id, $skycell_id, $tess_id, $camera, $dbname, $workdir, $no_update, $no_op, $save_temps);
@@ -123,5 +124,9 @@
 my $outputBin2 = $ipprc->filename("PSWARP.BIN2", $outputRoot, $skycell_id );
 my $outputStats = $outputRoot . '.stats';
-my $skyFile = caturi( $workdir, $skycell_id ); # Target sky cell file
+
+my $skyFile = skycell_file($tess_id, $skycell_id, $workdir) or 
+    &my_die("Unable to get name of skycell file", $warp_id, $skycell_id, $tess_id, $PS_EXIT_SYS_ERROR);
+&my_die("Unable to find skycell file", $warp_id, $skycell_id, $tess_id, $PS_EXIT_SYS_ERROR) unless
+    $ipprc->exists( $skyfile );
 
 my $traceDest = 'file:' . $ipprc->file_resolve($outputRoot) . ".trace"; # Trace messages