Fix for NSNull Issue