diff --git a/wire/core/ImageInspector.php b/wire/core/ImageInspector.php
index 9154b437..792f467c 100644
--- a/wire/core/ImageInspector.php
+++ b/wire/core/ImageInspector.php
@@ -135,7 +135,7 @@ class ImageInspector extends WireData {
 		if(is_array($additionalInfo) && $parseAppmarker) {
 			$appmarker = array();
 			foreach($additionalInfo as $k => $v) {
-				$appmarker[$k] = substr($v, 0, strpos($v, null));
+				$appmarker[$k] = substr($v, 0, strpos($v, chr(null)));
 			}
 			$this->info['appmarker'] = $appmarker;
 			if(isset($additionalInfo['APP13'])) {
diff --git a/wire/modules/Process/ProcessPageEditImageSelect/ProcessPageEditImageSelect.module b/wire/modules/Process/ProcessPageEditImageSelect/ProcessPageEditImageSelect.module
index e494ad5a..9751e7bf 100644
--- a/wire/modules/Process/ProcessPageEditImageSelect/ProcessPageEditImageSelect.module
+++ b/wire/modules/Process/ProcessPageEditImageSelect/ProcessPageEditImageSelect.module
@@ -443,7 +443,7 @@ class ProcessPageEditImageSelect extends Process implements ConfigurableModule {
 			if(!$field->type instanceof FieldtypeImage) continue; 
 			$numImageFields++;
 			$images = $page->getUnformatted($field->name); 
-			if(!count($images)) continue; 
+			if(!wireCount($images)) continue; 
 
 			foreach($images as $image) {
 				$numImages++;