Mixed Changes

Dialogs, pusher, index, terms
Fix php null error message