Exception handling improvements
Added AlertDialogFragment