HR-186 - Tweak $? checks