Reverted Image width/height null checks