Bug Fix - Fix for null pointer - Trello 184