Prevented the app from crashing when canceling the preference search by checking for tables size in the accessory view function
Merge remote-tracking branch 'origin/master'