Feature/fix nil defensio responses