[FIX] Class#find returns nil in case the object doesn't exist

@YaronWittenstein - this is my take on this. please review.