[PATCH] Graceful handling of errors when importing non-existent image