Alter result check based on feedback from @Ocramius and @Pittiplatsch